decko 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aeacf2fbbf0981f2cee104c70ae92aa444ebaac7
-  data.tar.gz: f1eb236d57cf919828baeea2ee765b96a7d42fa1
+  metadata.gz: 25be09f089dcb1105f21d9c37c4b4d62246e1d66
+  data.tar.gz: b81fc0417586e3d2c817f38776a72d26b9ac0c1b
 SHA512:
-  metadata.gz: d877cc738c99466edc35464b075ea017bfe1fe48d2c322767c190ae2a61627c17cb59fcf0f9d91d20e784f809ccbc7e804ab0c2757450711c5b94f13082c853d
-  data.tar.gz: db58b0aecd2e3f1a9a59b714ff2925ade4bc3b64218fad93185f4df246cf0850be88dd13b2056787ba9087a226eb3e9ecba8fcba25fa5fb00b8579b0a712eda3
+  metadata.gz: f7cb7af63f6a29ff8fedbac65cad06137a2659c6b21c32788de6a420ef5476ce8da1d0bb4081cc84ac312b98b9d981f9059f886a075613f7e583d93e7c580ba0
+  data.tar.gz: c7733d3d88ee69f7bc7970f1a650eaf6762959eaae7ea1437ddbf17e5143b34dab0cc5b158ffa7e060b29ee8cc5ba2389847b464c58ecdc5872a106fb1ff0d75

data/rails/controllers/card_controller.rb

@@ -18,7 +18,7 @@ class CardController < ActionController::Base
   #  PUBLIC METHODS
 
   def create
-    handle { card.save }
+    handle { card.save! }
   end
 
   def read
@@ -26,11 +26,11 @@ class CardController < ActionController::Base
   end
 
   def update
-    card.new_card? ? create : handle { card.update_attributes params[:card] }
+    card.new_card? ? create : handle { card.update_attributes! params[:card] }
   end
 
   def delete
-    handle { card.delete }
+    handle { card.delete! }
   end
 
   # @deprecated
@@ -69,20 +69,14 @@ class CardController < ActionController::Base
   end
 
   def load_card
-    handle_errors do
-      @card = Card.controller_fetch params
-      raise Card::Error::NotFound unless card
-      record_as_main
-    end
+    @card = Card.controller_fetch params
+    raise Card::Error::NotFound unless card
+    record_as_main
   end
 
   def load_action
-    handle_errors do
-      card.select_action_by_params params
-      if params[:edit_draft] && card.drafts.present?
-        card.content = card.last_draft_content
-      end
-    end
+    card.select_action_by_params params
+    card.content = card.last_draft_content if params[:edit_draft] && card.drafts.present?
   end
 
   # TODO: refactor this away this when new layout handling is ready
@@ -98,15 +92,10 @@ class CardController < ActionController::Base
 
   def handle
     card.act(success: true) do
-      yield ? render_success : render_errors
+      yield ? render_success : raise(Card::Error::UserError)
     end
   end
 
-  def handle_errors
-    yield
-    card.errors.any? ? render_errors : true
-  end
-
   # successful create, update, or delete action
   def render_success
     success = Card::Env.success.in_context card.name
@@ -132,14 +121,11 @@ class CardController < ActionController::Base
     end
   end
 
-  def render_errors
-    view, status = Card::Error.view_and_status(card) || [:errors, 422]
-    show view, status
-  end
-
   rescue_from StandardError do |exception|
-    Rails.logger.info "exception = #{exception.class}: #{exception.message}"
     @card ||= Card.new
-    show Card::Error.exception_view(@card, exception)
+    Card::Error.current = exception
+    error = Card::Error.cardify_exception exception, card
+    error.report
+    show error.class.view, error.class.status_code
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decko
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-20 00:00:00.000000000 Z
+date: 2018-09-25 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.1
+        version: 1.96.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.96.1
+        version: 1.96.2
 description: a wiki approach to stuctured data, dynamic interaction,  and web design
 email:
 - info@decko.org