kojac 0.13.0 → 0.15.0

data/spec/demo/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
-  remote: /Users/gary/repos/KOJAC
+  remote: ../..
   specs:
-    kojac (0.12.0)
+    kojac (0.15.0)
       active_model_serializers (= 0.9.0.alpha1)
       buzztools (~> 0.0.5)
       pundit (~> 0.2.3)
@@ -10,121 +10,149 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.0.1)
-      actionpack (= 4.0.1)
-      mail (~> 2.5.4)
-    actionpack (4.0.1)
-      activesupport (= 4.0.1)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
-      rack (~> 1.5.2)
+    actionmailer (4.2.5)
+      actionpack (= 4.2.5)
+      actionview (= 4.2.5)
+      activejob (= 4.2.5)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.5)
+      actionview (= 4.2.5)
+      activesupport (= 4.2.5)
+      rack (~> 1.6)
       rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.5)
+      activesupport (= 4.2.5)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
     active_model_serializers (0.9.0.alpha1)
       activemodel (>= 3.2)
-    activemodel (4.0.1)
-      activesupport (= 4.0.1)
-      builder (~> 3.1.0)
-    activerecord (4.0.1)
-      activemodel (= 4.0.1)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.1)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.1)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    arel (4.0.1)
-    atomic (1.1.14)
-    builder (3.1.4)
-    buzztools (0.0.8)
+    activejob (4.2.5)
+      activesupport (= 4.2.5)
+      globalid (>= 0.3.0)
+    activemodel (4.2.5)
+      activesupport (= 4.2.5)
+      builder (~> 3.1)
+    activerecord (4.2.5)
+      activemodel (= 4.2.5)
+      activesupport (= 4.2.5)
+      arel (~> 6.0)
+    activesupport (4.2.5)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    arel (6.0.3)
+    builder (3.2.2)
+    buzztools (0.0.11)
     diff-lcs (1.2.5)
     erubis (2.7.0)
-    execjs (2.0.2)
-    factory_girl (4.3.0)
+    execjs (2.6.0)
+    factory_girl (4.5.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.3.0)
-      factory_girl (~> 4.3.0)
+    factory_girl_rails (4.5.0)
+      factory_girl (~> 4.5.0)
       railties (>= 3.0.0)
-    faker (1.2.0)
+    faker (1.6.1)
       i18n (~> 0.5)
+    globalid (0.3.6)
+      activesupport (>= 4.1.0)
     hike (1.2.3)
-    i18n (0.6.9)
+    i18n (0.7.0)
     jbuilder (1.5.3)
       activesupport (>= 3.0.0)
       multi_json (>= 1.2.0)
-    jquery-rails (3.0.4)
-      railties (>= 3.0, < 5.0)
+    jquery-rails (4.0.5)
+      rails-dom-testing (~> 1.0)
+      railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.1)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.25.1)
-    minitest (4.7.5)
-    multi_json (1.8.2)
-    polyglot (0.3.3)
+    json (1.8.3)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
+    mime-types (2.99)
+    mini_portile2 (2.0.0)
+    minitest (5.8.3)
+    multi_json (1.11.2)
+    nokogiri (1.6.7)
+      mini_portile2 (~> 2.0.0.rc2)
+    psych (2.0.4)
     pundit (0.2.3)
       activesupport (>= 3.0.0)
-    rack (1.5.2)
-    rack-test (0.6.2)
+    rack (1.6.4)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.0.1)
-      actionmailer (= 4.0.1)
-      actionpack (= 4.0.1)
-      activerecord (= 4.0.1)
-      activesupport (= 4.0.1)
+    rails (4.2.5)
+      actionmailer (= 4.2.5)
+      actionpack (= 4.2.5)
+      actionview (= 4.2.5)
+      activejob (= 4.2.5)
+      activemodel (= 4.2.5)
+      activerecord (= 4.2.5)
+      activesupport (= 4.2.5)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.1)
-      sprockets-rails (~> 2.0.0)
-    railties (4.0.1)
-      actionpack (= 4.0.1)
-      activesupport (= 4.0.1)
+      railties (= 4.2.5)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.7)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.2)
+      loofah (~> 2.0)
+    railties (4.2.5)
+      actionpack (= 4.2.5)
+      activesupport (= 4.2.5)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.1.0)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.4)
+    rake (10.4.2)
+    rdoc (4.2.0)
+    responders (2.1.0)
+      railties (>= 4.2.0, < 5)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
-    rspec-rails (2.14.0)
+    rspec-mocks (2.14.6)
+    rspec-rails (2.14.2)
       actionpack (>= 3.0)
+      activemodel (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    sass (3.2.12)
-    sass-rails (4.0.1)
+    sass (3.2.19)
+    sass-rails (4.0.5)
       railties (>= 4.0.0, < 5.0)
-      sass (>= 3.1.10)
-      sprockets-rails (~> 2.0.0)
-    sdoc (0.3.20)
-      json (>= 1.1.3)
-      rdoc (~> 3.10)
-    sprockets (2.10.1)
+      sass (~> 3.2.2)
+      sprockets (~> 2.8, < 3.0)
+      sprockets-rails (~> 2.0)
+    sdoc (0.4.1)
+      json (~> 1.7, >= 1.7.7)
+      rdoc (~> 4.0)
+    sprockets (2.12.4)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.0.1)
+    sprockets-rails (2.3.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
-      sprockets (~> 2.8)
-    sqlite3 (1.3.8)
-    thor (0.18.1)
-    thread_safe (0.1.3)
-      atomic
+      sprockets (>= 2.8, < 4.0)
+    sqlite3 (1.3.11)
+    thor (0.19.1)
+    thread_safe (0.3.5)
     tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.38)
-    uglifier (2.3.2)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     underscore_plus (0.9.1)
@@ -140,9 +168,14 @@ DEPENDENCIES
   jbuilder (~> 1.2)
   jquery-rails
   kojac!
-  rails (= 4.0.1)
-  rspec-rails
+  psych (= 2.0.4)
+  rails (~> 4.2)
+  responders (~> 2.0)
+  rspec-rails (~> 2.14)
   sass-rails (~> 4.0.0)
   sdoc
   sqlite3
   uglifier (>= 1.3.0)
+
+BUNDLED WITH
+   1.10.6

data/spec/demo/app/policies/user_policy.rb

@@ -4,46 +4,39 @@ class UserPolicy < KojacBasePolicy
 		user.id == record.id
 	end
 
-	# def write?
-	#   return query_ring <= ADMIN_RING if @record==User
-	#   raise "Bad record given" unless record.is_a? User
-	#   return ((query_ring <= SYSADMIN_RING) || is_self? || (
-	#
-	#   ))
-	# end
-
-	allow_filter do |aPolicy,aResult,aRing,aAbility|
-		if aRing <= SYSADMIN_RING     # sysadmin can do all, so pass through
-			aResult
-		elsif (aPolicy.user.owner_id and aPolicy.record.owner_id != aPolicy.user.owner_id)  # user has a ring that doesn't match record
-			aResult = []
-		elsif aRing > USER_RING       # outside of user, can't do anything
-			aResult
+	allow_filter do |p,fields|
+		ring = p.user.ring
+		if ring <= SYSADMIN_RING     # sysadmin can do all, so pass through
+			fields
+		elsif (p.user.owner_id and p.record.owner_id != p.user.owner_id)  # user has a ring that doesn't match record
+			fields = []
+		elsif ring > USER_RING       # outside of user, can't do anything
+			fields
 		else
-			if aPolicy.is_self? or (aRing < aPolicy.record.ring and aRing <= ADMIN_RING)    # can admin if self or admin and lower rank
-				case aAbility
+			if p.is_self? or (ring < p.record.ring and ring <= ADMIN_RING)    # can admin if self or admin and lower rank
+				case p.ability
 					when :write
-						aResult += User::PUBLIC_FIELDS + User::PRIVATE_FIELDS
+						fields += User::PUBLIC_FIELDS + User::PRIVATE_FIELDS
 					when :read
-						aResult += User::PRIVATE_FIELDS
+						fields += User::PRIVATE_FIELDS
 				end
 			end
-			aResult
+			fields
 		end
 	end
 
-	# allow_filter ring: :guest_admin, ability: :write do |aPolicy,aResult,aRing,aAbility|
-	# 	aResult && aPolicy.is_self?
+	# allow_filter ring: :guest_admin, ability: :write do |aPolicy,aFields|
+	# 	aPolicy.is_self? ? aFields : []
 	# end
 	#
-	# allow_filter ability: [:create, :write] do |aPolicy,aRing,aAbility,aFields,aResult|
+	# allow_filter ability: [:create, :write] do |aPolicy,aFields|
 	# 	# logic here to set aResult
-	# 	aResult
+	# 	aFields
 	# end
 	#
 	# # prevent guest_admin from creating or writing Users, even though  outer rings can
-	# allow_filter ring: :guest_admin, ability: [:create, :write] do |aUser,aRecord,aAbility,aFields,aResult|
-	# 	false
+	# allow_filter ring: :guest_admin, ability: [:create, :write] do |aPolicy,aFields|
+	# 	[]
 	# end
 
 	# def permitted_attributes(aAbility=nil)
@@ -56,7 +49,7 @@ class UserPolicy < KojacBasePolicy
 	#
 	# 	result = super(aAbility)
 	#
-	# 	if is_self? && query_ring <= USER_RING
+	# 	if is_self? && user_ring <= USER_RING
 	# 		case aAbility
 	# 			when :write
 	# 				result = (result | (User::PUBLIC_FIELDS + User::PRIVATE_FIELDS)).sort

data/spec/demo/spec/controllers/allowed_fields_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe KojacBaseController do
+describe KojacFrontController do
 
 	#before(:each) do
 	#	#@user = FactoryGirl.create(:user, ring: 3)
@@ -17,7 +17,7 @@ describe KojacBaseController do
 		draw_routes do
 			get ":controller/:action"
 		end
-		result,error = do_op(read_op)
+		result,error = exec_op(read_op)
 		result.keys.sort.should == (User::PUBLIC_FIELDS).map(&:to_s).sort
 	end
 
@@ -31,7 +31,7 @@ describe KojacBaseController do
 		draw_routes do
 			get ":controller/:action"
 		end
-		result,error = do_op(read_op)
+		result,error = exec_op(read_op)
 		result.keys.sort.should == (User::PUBLIC_FIELDS + User::PRIVATE_FIELDS + User::ADMIN_FIELDS + User::READ_ONLY_FIELDS).map(&:to_s).sort
 	end
 
@@ -49,7 +49,7 @@ describe KojacBaseController do
 		draw_routes do
 			get ":controller/:action"
 		end
-		result,error = do_op(send_op)
+		result,error = exec_op(send_op)
 
 		error['kind'].should == 'Exception'
 		error.g?('errors.0.message').should == "You are not authorized to perform this action"
@@ -66,7 +66,7 @@ describe KojacBaseController do
 		draw_routes do
 			get ":controller/:action"
 		end
-		result,error = do_op(send_op)
+		result,error = exec_op(send_op)
 		result.keys.sort.should == (User::PUBLIC_FIELDS + User::PRIVATE_FIELDS).map(&:to_s).sort
 	end
 
@@ -83,7 +83,7 @@ describe KojacBaseController do
 		draw_routes do
 			get ":controller/:action"
 		end
-		result,error = do_op(send_op)
+		result,error = exec_op(send_op)
 		result['last_name'].should == send_op.g?('value.last_name')
 		result.keys.sort.should == (User::PUBLIC_FIELDS + User::PRIVATE_FIELDS).map(&:to_s).sort
 	end
@@ -102,7 +102,7 @@ describe KojacBaseController do
 		draw_routes do
 			get ":controller/:action"
 		end
-		result,error = do_op(send_op)
+		result,error = exec_op(send_op)
 		result['last_name'].should == send_op.g?('value.last_name')
 		user2.reload
 		user2.last_name.should == send_op.g?('value.last_name')
@@ -123,7 +123,7 @@ describe KojacBaseController do
 		draw_routes do
 			get ":controller/:action"
 		end
-		result,error = do_op(send_op)
+		result,error = exec_op(send_op)
 		error['kind'].should == 'Exception'
 		error.g?('errors.0.message').should == "You are not authorized to perform this action"
 		user2.reload

data/spec/demo/spec/features/concentric_spec.rb

@@ -72,13 +72,13 @@ describe "ConcentricTestModel" do
 		end
 
 		class TestUserPolicy < KojacBasePolicy
-			allow_filter ability: :write, ring: :boss do |aPolicy,aResult,aRing,aAbility|   # boss can't write other people's passwords
-				aResult -= [:password] if aPolicy.user.id != aPolicy.record.id
-				aResult
+			allow_filter ability: :write, ring: :boss do |p,fields|   # boss can't write other people's passwords
+				fields -= [:password] if p.user.id != p.record.id
+				fields
 			end
-			allow_filter do |aPolicy,aResult,aRing,aAbility|   # boss can't write other people's passwords
-				aResult = [] if aPolicy.user.id != aPolicy.record.id and aPolicy.user.ring >= aPolicy.record.ring and aPolicy.user.ring >= Concentric.lookup_ring(:master)
-				aResult
+			allow_filter do |p,fields|   # boss can't write other people's passwords
+				fields = [] if p.user.id != p.record.id and p.user.ring >= p.record.ring and p.user.ring >= Concentric.lookup_ring(:master)
+				fields
 			end
 		end
 

data/spec/{model_ring_spec.rb → demo/spec/models/model_ring_spec.rb}

@@ -11,13 +11,9 @@ describe "Simple Item1 rings" do
 
 
   it "can specify ring fields" do
-	  Item1.rings_fields.should == [
-		  nil, 
-		  nil, 
-		  nil, 
-		  {:write=>[:address, :name], :read=>[:address, :member_code, :name]}
-	  ]
-	  Item1.rings_abilities.should == []
+	  Item1.rings_abilities.should == {
+		  3 => {:write=>[:address, :name], :read=>[:address, :member_code, :name]}
+	  }
   end
 end
 
@@ -26,27 +22,17 @@ describe "Item2 rings with abilities" do
 	class Item2 < ActiveRecord::Base
 		include Concentric::Model
 
-		ring 2, [:write,:delete]
+		ring 2, [:delete] => :this
 		ring 3, :write => [:name,:address]
 		ring 3, :read => [:name,:address,:member_code]
-		ring 4, :read
 	end
 
 
   it "can specify ring fields" do
-	  Item2.rings_fields.should == [
-		  nil, 
-		  nil, 
-		  nil, 
-		  {:write=>[:address, :name], :read=>[:address, :member_code, :name]}
-	  ]
-	  Item2.rings_abilities.should == [
-		  nil,
-	    nil,
-	    [:delete,:write],
-	    nil,
-	    [:read]
-	  ]
+	  Item2.rings_abilities.should == {
+	    2 => {:delete=>true},
+	    3 => {:write=>[:address, :name], :read=>[:address, :member_code, :name]}
+	  }
   end
 end
 

data/spec/demo/spec/spec_utils.rb

@@ -5,11 +5,11 @@ def stub_login_user(aValues=nil)
 	aValues ||= {}
 	aValues[:ring] ||= USER_RING
 	user = FactoryGirl.create(:user,aValues)
-	ApplicationController.any_instance.stub(:current_user).and_return(user)
+	KojacFrontController.any_instance.stub(:current_user).and_return(user)
 	user
 end
 
-def do_op(read_op)
+def exec_op(read_op)
 	content = {
 		options: {},
 		ops: [
@@ -19,14 +19,14 @@ def do_op(read_op)
 	request.accept = "application/json"
 	post :receive, format: :json, kojac: content
 	result = nil
-	error = nil
+	err = nil
 	output = JSON.parse response.body
 	if output['error']
 		response.status.should >= 400
 		output.g?('error.errors').should be_a Array
 		output.g?('error.kind').should be
 		output['error']['errors'].length.should >= 1
-		error = output['error']
+		err = output['error']
 	else
 		response.status.should == 200
 		output['ops'].should be_a Array
@@ -34,7 +34,7 @@ def do_op(read_op)
 		op = output['ops'].first
 		result = op['results'][op['result_key']]
 	end
-	[result,error]
+	[result,err]
 end
 
 # from http://openhood.com/rails/rails%203/2010/07/20/add-routes-at-runtime-rails-3/

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kojac
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Gary McGhee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-11 00:00:00.000000000 Z
+date: 2015-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: buzztools
@@ -66,6 +66,34 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.9.0.alpha1
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: KOJAC is an opinionated design and implementation for data management
   within Single Page Applications. It relates most heavily to the client and data
   protocol. The server may continue the key/value style down to a key/value-style
@@ -86,9 +114,10 @@ files:
 - app/assets/javascripts/kojac.js
 - app/assets/javascripts/kojac_canjs.js
 - app/assets/javascripts/kojac_ember.js
-- app/controllers/kojac_base_controller.rb
+- app/controllers/kojac_front_controller.rb
 - app/controllers/kojac_front_methods.rb
 - app/controllers/kojac_metal_controller.rb
+- app/policies/concentric_policy.rb
 - app/policies/kojac_base_policy.rb
 - app/serializers/kojac_base_serializer.rb
 - diagram.odg
@@ -96,7 +125,7 @@ files:
 - lib/kojac.rb
 - lib/kojac/app_serialize.rb
 - lib/kojac/concentric.rb
-- lib/kojac/kojac_policy.rb
+- lib/kojac/kojac_controller.rb
 - lib/kojac/kojac_rails.rb
 - lib/kojac/version.rb
 - lib/tasks/kojac_tasks.rake
@@ -104,7 +133,9 @@ files:
 - spec/can_cache_spec.js
 - spec/can_factory_spec.js
 - spec/can_model_spec.js
+- spec/demo/.generators
 - spec/demo/.gitignore
+- spec/demo/.rakeTasks
 - spec/demo/.ruby-version
 - spec/demo/Gemfile
 - spec/demo/Gemfile.lock
@@ -162,6 +193,7 @@ files:
 - spec/demo/spec/factories/users.rb
 - spec/demo/spec/features/concentric_spec.rb
 - spec/demo/spec/features/serialization_spec.rb
+- spec/demo/spec/models/model_ring_spec.rb
 - spec/demo/spec/spec_helper.rb
 - spec/demo/spec/spec_utils.rb
 - spec/demo/vendor/assets/javascripts/.keep
@@ -207,7 +239,6 @@ files:
 - spec/mockjson/order_item__51.js
 - spec/mockjson/product.js
 - spec/mockjson/product__3.js
-- spec/model_ring_spec.rb
 - spec/operation_include_spec.js
 - spec/run.html
 - spec/spec.js
@@ -235,7 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: KOJAC is an opinionated design and implementation for data management within
@@ -244,7 +275,9 @@ test_files:
 - spec/can_cache_spec.js
 - spec/can_factory_spec.js
 - spec/can_model_spec.js
+- spec/demo/.generators
 - spec/demo/.gitignore
+- spec/demo/.rakeTasks
 - spec/demo/.ruby-version
 - spec/demo/Gemfile
 - spec/demo/Gemfile.lock
@@ -302,6 +335,7 @@ test_files:
 - spec/demo/spec/factories/users.rb
 - spec/demo/spec/features/concentric_spec.rb
 - spec/demo/spec/features/serialization_spec.rb
+- spec/demo/spec/models/model_ring_spec.rb
 - spec/demo/spec/spec_helper.rb
 - spec/demo/spec/spec_utils.rb
 - spec/demo/vendor/assets/javascripts/.keep
@@ -347,7 +381,6 @@ test_files:
 - spec/mockjson/order_item__51.js
 - spec/mockjson/product.js
 - spec/mockjson/product__3.js
-- spec/model_ring_spec.rb
 - spec/operation_include_spec.js
 - spec/run.html
 - spec/spec.js