kojac 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4c2362fb512574c8a5ef15983cca66fd6bd2aab
-  data.tar.gz: 1f23df6b7d057f077b5563523cd7cf86d6e4862f
+  metadata.gz: 5b57d61c1e54a860a73ee4902a32c94c79b8f3d5
+  data.tar.gz: 8e94983aa550cabd1806f550530a11e5b6bd237a
 SHA512:
-  metadata.gz: a6ca900452043b77c3cdb3433dc3ab4763d9be78483f514f6c09e87c31fed58ef3c67c43ee81f074a45569a70ae1a0f4ff47c4d0b28b711f77b1df7e037f6ae3
-  data.tar.gz: 177f53ce53cdd7f5d3f4afa9128332b78cbd392cfce2b4228cbea2dad4e2666ebb275088eb33e8669bcc14eb931bc399dec2a406d6a6e20206f0b16259a9f603
+  metadata.gz: f1f1c96b5f78d9fc219e59d294144b92765828a70c19561b8ac3ca9b8551d70535d1d675979f9307b36c932e4dccb98d26ced62255761051f947a1704c629306
+  data.tar.gz: 456a272aee41e4c3fe7786cfa918a6b99567e8556ecf6239f86267ead5af67ee30e616b35968d657c951e16574ee6d4555264432b5a22b75ff62e97f382693c5

data/app/assets/javascripts/kojac.js

@@ -1340,34 +1340,59 @@ Kojac.RemoteProvider = Kojac.Object.extend({
 				contentType: "application/json; charset=utf-8",
 				dataType: "json"
 			};
-			var result = jQuery.ajax(this.serverPath,ajaxpars).done(function(aResult,aStatus,aXhr){
-				// poke results into request ops using request_op_index
-				aRequest.xhr = aXhr;
-				for (var i=0;i<server_ops.length;i++) {
-					var opRequest = server_ops[i]; //aRequest.ops[request_op_index[i]];
-					var opResult = (_.isArray(aResult.ops) && (i<aResult.ops.length) && aResult.ops[i]);
-					opRequest.fromCache = false;
-					opRequest.performed = true;
-					if (opResult.error) {
-						opRequest.error = opResult.error;
-						aRequest.handlers.handleError(opResult.error);
-						break;
+
+			var handleAjaxResponse = function(aResult,aStatus,aXhr) {
+				if (aResult instanceof Error || (aResult.error && !aResult.ops)) { // new code returns errors without ops
+					if (aResult.error) {
+						aRequest.error = aResult.error;
 					} else {
-						opRequest.receiveResult(opResult);
+						aRequest.error = me.interpretXhrError(aXhr);
+						if (aStatus == "parsererror") {
+							aRequest.error.http_code = 500;
+							aRequest.error.kind = "parserError";
+							aRequest.error.message = "A data error occurred (parserError)";
+							aRequest.error.debug_message = aResult.message;
+						}
+					}
+					aRequest.error.headers = aXhr.getAllResponseHeaders();
+					aRequest.error.response = aXhr.responseText;
+
+					//_.removeKey(aRequest,'results');
+					for (var i=0;i<server_ops.length;i++) {
+						var opRequest = server_ops[i]; //aRequest.ops[request_op_index[i]];
+						opRequest.fromCache = false;
+						opRequest.performed = true;
+						//if (opRequest.error)
+						//	_.removeKey(opRequest,'results');
+					}
+
+					aRequest.handlers.handleError(aRequest.error);
+				} else {    // ops may have errors
+					// poke results into request ops using request_op_index
+					aRequest.xhr = aXhr;
+					for (var i=0;i<server_ops.length;i++) {
+						var opRequest = server_ops[i]; //aRequest.ops[request_op_index[i]];
+						var opResult = (_.isArray(aResult.ops) && (i<aResult.ops.length) && aResult.ops[i]);
+						opRequest.fromCache = false;
+						opRequest.performed = true;
+						if (!opResult)
+							opResult = null;
+						if (aResult.error) {
+							opRequest.error = opResult.error;
+							aRequest.handlers.handleError(opResult.error);
+							break;
+						} else {
+							opRequest.receiveResult(opResult);
+						}
 					}
 				}
+			};
+
+			var result = jQuery.ajax(this.serverPath,ajaxpars).done(function(aResult,aStatus,aXhr){
+				handleAjaxResponse(aResult,aStatus,aXhr);
 				aRequest.handlers.callNext();
 			}).fail(function(aXhr,aStatus,aError){
-				aRequest.error = me.interpretXhrError(aXhr);
-				//_.removeKey(aRequest,'results');
-				for (var i=0;i<server_ops.length;i++) {
-					var opRequest = server_ops[i]; //aRequest.ops[request_op_index[i]];
-					opRequest.fromCache = false;
-					opRequest.performed = true;
-					//if (opRequest.error)
-					//	_.removeKey(opRequest,'results');
-				}
-				aRequest.handlers.handleError(aRequest.error);
+				handleAjaxResponse(aError,aStatus,aXhr);
 				aRequest.handlers.callNext();
 			});
 		}
@@ -1383,8 +1408,6 @@ Kojac.RemoteProvider = Kojac.Object.extend({
 		if (http_code = (aXhr && aXhr.status)) {
 			kind = (aXhr.statusText && aXhr.statusText.replace(' ',''));
 			message = debug_message = aXhr.statusText;
-			headers = aXhr.getAllResponseHeaders();
-			response = aXhr.responseText;
 		} else {
 			http_code = null;
 			kind = "NetworkError";
@@ -1398,8 +1421,6 @@ Kojac.RemoteProvider = Kojac.Object.extend({
 			message: message,       // an explanation for normal humans
 			debug_message: debug_message, // an explanation for developers
 			xhr: aXhr,  // the original XHR object from jQuery
-			headers: headers,       // all response headers
-			response: response      // the response body
 		}
 	}
 });

data/app/controllers/kojac_front_methods.rb

@@ -3,7 +3,7 @@ module KojacFrontMethods
 	protected
 
 	def unauthorized!(aMessage=nil)
-		raise aMessage || "You are not authorized to perform this action"
+		raise ::Pundit::NotAuthorizedError, aMessage||"You are not authorized to perform this action"
 	end
 
 	def do_op(op)
@@ -62,20 +62,34 @@ module KojacFrontMethods
 			Rails.logger.debug e.message
 			Rails.logger.debug e.backtrace.join("\n") unless Rails.env.production?
 			handle_exception(e) if respond_to? :handle_exception
-			output = {
-				error: {
-					format: 'KojacError',
-					kind: 'Exception',
-					errors: [{
-						message: e.message
-					}]
+
+			if e.is_a? ::Pundit::NotAuthorizedError
+				output = {
+					error: {
+						format: 'KojacError',
+						kind: 'Exception',
+						errors: [{
+							message: e.message
+						}]
+					}
+				}
+				status = :unauthorized
+			else
+				output = {
+					error: {
+						format: 'KojacError',
+						kind: 'Exception',
+						errors: [{
+							message: e.message
+						}]
+					}
 				}
-			}
+				status = output[:error] ? :unprocessable_entity : :ok
+			end
 			output[:error][:errors][0][:backtrace] = e.backtrace unless Rails.env.production?
 			output
 		end
 		send(:after_process, [aInputJson, output]) if respond_to? :after_process
-		status = output[:error] ? :unprocessable_entity : :ok
 		jsono = KojacUtils.to_jsono(output, scope: current_user)
 		[jsono,status]
 	end

data/lib/kojac/kojac_rails.rb

@@ -626,12 +626,12 @@ module Kojac
 			action = rails_controller? ? "execute_#{action}" : "execute__#{action}"
 			raise "action #{action} not implemented on #{resource}" unless respond_to? action.to_sym
 			result = rails_controller? ? send(action.to_sym,op) : send(action)
-			error = rails_controller? ? op[:error] : (respond_to?(:error).to_nil && send(:error))
-			if error
+			err = rails_controller? ? op[:error] : (respond_to?(:error).to_nil && send(:error))
+			if err
 				{
 					key: op[:key],
 				  verb: op[:verb],
-					error: error
+					error: err
 				}
 			else
 				result_key = op[:result_key] || op[:key]

data/lib/kojac/version.rb

@@ -1,3 +1,3 @@
 module Kojac
-  VERSION = "0.15.0"
+  VERSION = "0.16.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kojac
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Gary McGhee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-01 00:00:00.000000000 Z
+date: 2015-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: buzztools