kojac 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b57d61c1e54a860a73ee4902a32c94c79b8f3d5
-  data.tar.gz: 8e94983aa550cabd1806f550530a11e5b6bd237a
+  metadata.gz: 8ce41f3a1932c5ac23b356872facc2c1e49fc69d
+  data.tar.gz: 837458076b3e82a622b90598b5197657bf484507
 SHA512:
-  metadata.gz: f1f1c96b5f78d9fc219e59d294144b92765828a70c19561b8ac3ca9b8551d70535d1d675979f9307b36c932e4dccb98d26ced62255761051f947a1704c629306
-  data.tar.gz: 456a272aee41e4c3fe7786cfa918a6b99567e8556ecf6239f86267ead5af67ee30e616b35968d657c951e16574ee6d4555264432b5a22b75ff62e97f382693c5
+  metadata.gz: 82996d14532fc94ad77ad71394d806e0c5b67767bc12c315a7e11b6bc123eac65bdc16de48415d548a12d86d4b24f7b7de0e2b779837fd8503f107445210a291
+  data.tar.gz: 5a9662ca4d8668845d5a455f69e376b71a99b2b9e830632082014f6849bd1461b9940c9c8fd6fc388dbc2823273589b89784b9ea0840a6c461ec6f11614cb3c2

data/app/assets/javascripts/kojac.js

@@ -1357,13 +1357,10 @@ Kojac.RemoteProvider = Kojac.Object.extend({
 					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);

data/app/controllers/kojac_front_methods.rb

@@ -63,29 +63,31 @@ module KojacFrontMethods
 			Rails.logger.debug e.backtrace.join("\n") unless Rails.env.production?
 			handle_exception(e) if respond_to? :handle_exception
 
+			status_code = 422
 			if e.is_a? ::Pundit::NotAuthorizedError
-				output = {
-					error: {
-						format: 'KojacError',
-						kind: 'Exception',
-						errors: [{
-							message: e.message
-						}]
-					}
-				}
-				status = :unauthorized
+				status_code = 403
+			elsif e.is_a? ::StandardExceptions::Exception
+				status_code = e.status
 			else
-				output = {
-					error: {
-						format: 'KojacError',
-						kind: 'Exception',
-						errors: [{
-							message: e.message
-						}]
-					}
-				}
-				status = output[:error] ? :unprocessable_entity : :ok
+				if output.is_a? Hash
+					error = output[:error] && output['error']
+					status_code = 422
+				else
+					status_code = 500
+				end
 			end
+			status = ::Rack::Utils::HTTP_STATUS_CODES[status_code || 500].downcase.gsub(/\s|-/, '_').to_sym
+			output = {
+				error: {
+					format: 'KojacError',
+					kind: 'Exception',
+					errors: [{
+										 message: e.message,
+										 status: status.to_s,
+										 status_code: status_code
+									 }]
+				}
+			}
 			output[:error][:errors][0][:backtrace] = e.backtrace unless Rails.env.production?
 			output
 		end

data/app/policies/concentric_policy.rb

@@ -1,5 +1,9 @@
+require 'standard_exceptions'
+
 class ConcentricPolicy
 
+	include ::StandardExceptions::Methods
+
 	class_attribute :filters
 
   attr_reader :user, :record, :ability
@@ -32,7 +36,15 @@ class ConcentricPolicy
 	# this could use an alternative field or method in future
   def user_ring
 	  user.ring
-  end
+	end
+
+	def record_class
+		record.is_a?(Class) ? record : record.class
+	end
+
+	def record_instance
+		record.is_a?(Class) ? nil : record
+	end
 
 	def apply_filters(aResult)
 		if self.class.filters
@@ -54,6 +66,21 @@ class ConcentricPolicy
 		aResult
 	end
 
+	def inner_query_ability(aAbility)
+		@ability = aAbility
+		internal_server_error! "aAbility must be a string or a symbol" unless aAbility.is_a?(String) or aAbility.is_a?(Symbol)
+		aAbility = aAbility.to_s
+
+		case aAbility
+			when 'write','read','update','show','edit'
+				inner_query_fields(aAbility).length > 0
+			when 'create','destroy','index'
+				inner_query_resource(aAbility)
+			else
+				internal_server_error! 'this ability is unknown'
+		end
+	end
+
   def inner_query_fields(aAbility=nil)
 	  aAbility = @ability = (aAbility || @ability)
 	  raise "Ability must be set or given" unless aAbility
@@ -61,7 +88,25 @@ class ConcentricPolicy
 	  result = cls.permitted(user_ring,aAbility)
 	  result = apply_filters(result)
 	  result
-  end
+	end
+
+	def inner_query_resource(aAbility)
+		internal_server_error! "aAbility must be a string or a symbol" unless aAbility.is_a?(String) or aAbility.is_a?(Symbol)
+		return false unless user_ring and rings_abilities = record_class.respond_to?(:rings_abilities) && record_class.rings_abilities.to_nil
+		unauthorized! "identity not given" if !user
+
+		aAbility = aAbility.to_s
+
+		ring_keys = rings_abilities.keys.sort
+		ring_keys.each do |i|
+			next unless i >= user_ring
+			next unless ring_rec = rings_abilities[i]
+			#next unless ring_rec.has_key? aAbility.to_sym
+			perm = ring_rec[aAbility.to_sym]
+			return true if perm==true or perm==:this or perm.is_a?(Array) && !perm.empty?
+		end
+		false
+	end
 
 	def permitted_attributes(aAbility=nil)
 		inner_query_fields(aAbility)
@@ -81,14 +126,17 @@ class ConcentricPolicy
 		result
 	end
 
-	def inner_query_ability(aAbility)
-		@ability = aAbility
-		inner_query_fields.length > 0
+	def defaults
+		{}
+	end
+
+	def valid?
+		true
 	end
 
   # kojac methods
   def create?
-	  inner_query_ability(:create)
+	  inner_query_ability(:create) && valid?
   end
 
   def read?
@@ -96,7 +144,7 @@ class ConcentricPolicy
   end
 
   def write?
-	  inner_query_ability(:write)
+	  inner_query_ability(:write) && valid?
   end
 
   def destroy?

data/kojac.gemspec

@@ -26,6 +26,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "pundit", '~> 0.2.3'
   s.add_runtime_dependency "active_model_serializers", '= 0.9.0.alpha1'
 
+  s.add_runtime_dependency "standard_exceptions", '~> 0.1.4', '>= 0.1.4.0'
+
   #s.add_runtime_dependency "jquery-rails"
   #s.add_runtime_dependency "rails", ">= 3.1"
   s.add_development_dependency "rake"

data/lib/kojac/concentric.rb

@@ -104,7 +104,7 @@ module Concentric::Model
 				abilities.each do |a|
 					a = a.to_sym
 					ring_rec ||= {}
-					if fields==[:this]
+					if fields==[:this] || fields==[true]
 						ring_rec[a] = true unless ring_rec[a].to_nil
 					else
 						ring_fields = ring_rec[a]

data/lib/kojac/kojac_rails.rb

@@ -1,4 +1,5 @@
 require 'pundit'
+require 'standard_exceptions'
 
 Kernel.class_eval do
   def key_join(aResource,aId=nil,aAssoc=nil)
@@ -197,6 +198,8 @@ module Kojac
 
 	module ControllerOpMethods
 
+		include ::StandardExceptions::Methods
+
 		def self.included(aClass)
 	    #aClass.send :extend, ClassMethods
 	    # aClass.send :include, ActiveSupport::Callbacks
@@ -307,13 +310,17 @@ module Kojac
 						}
 					end
 				else    # create operation on a resource eg. {verb: "CREATE", key: "order_items"} but may have embedded association values
-					if model_class.ring_can?(:create,ring)
+					if model_class.ring_can?(ring,:create)
 						policy = Pundit.policy!(current_user,model_class)
 						p_fields = policy.permitted_fields(:write)
 
-						p_fields = op[:value].permit( *p_fields )
+						# see the 20171213-Permissions branch for work here
+						p_fields = op[:value].reverse_merge!(policy.defaults).permit( *p_fields )
 						model_class.write_op_filter(current_user,p_fields,op[:value]) if model_class.respond_to? :write_op_filter
-						item = model_class.create!(p_fields)
+						item = model_class.new(p_fields)
+						policy = Pundit.policy!(current_user,item)
+						forbidden! unless policy.create?
+						item.save!
 
 						options_include = options['include'] || []
 						included_assocs = []
@@ -325,6 +332,7 @@ module Kojac
 								included_assocs << a.to_sym
 							end
 						end
+						forbidden! unless policy.create?
 						item.save!
 						result_key = op[:result_key] || item.kojac_key
 						merge_model_into_results(item,result_key,:include => included_assocs)

data/lib/kojac/version.rb

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

data/spec/demo/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: ../..
   specs:
-    kojac (0.15.0)
+    kojac (0.16.0)
       active_model_serializers (= 0.9.0.alpha1)
       buzztools (~> 0.0.5)
       pundit (~> 0.2.3)
+      standard_exceptions (~> 0.1.4, >= 0.1.4.0)
       underscore_plus (~> 0.9.1)
 
 GEM
@@ -147,6 +148,7 @@ GEM
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
     sqlite3 (1.3.11)
+    standard_exceptions (0.1.4.1)
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (1.4.1)
@@ -178,4 +180,4 @@ DEPENDENCIES
   uglifier (>= 1.3.0)
 
 BUNDLED WITH
-   1.10.6
+   1.12.4

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kojac
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Gary McGhee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-23 00:00:00.000000000 Z
+date: 2017-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: buzztools
@@ -66,6 +66,26 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.9.0.alpha1
+- !ruby/object:Gem::Dependency
+  name: standard_exceptions
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.4
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.4
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.4.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement