kojac 0.11.0 → 0.12.0

data/lib/kojac/kojac_rails.rb

@@ -78,9 +78,10 @@ module KojacUtils
 		end
 	end
 
-	def to_jsono(aObject,aOptions)
+	def to_jsono(aObject,aOptions=nil)
+		aOptions ||= {}
 		if aObject.is_a?(Hash) or aObject.respond_to? :attributes
-			serializer_for(aObject).new(aObject,aOptions).serializable_object
+			serializer_for(aObject).new(aObject,aOptions).serializable_hash
 		elsif aObject.respond_to?(:to_ary) && aObject.first  # Array
 			item_sz = serializer_for(aObject.first)
 		  ActiveModel::ArraySerializer.new(aObject,aOptions.merge(each_serializer: item_sz)).as_json(aOptions)
@@ -198,8 +199,8 @@ module Kojac
 
 		def self.included(aClass)
 	    #aClass.send :extend, ClassMethods
-	    aClass.send :include, ActiveSupport::Callbacks
-	    aClass.send :define_callbacks, :update_op, :scope => [:kind, :name]
+	    # aClass.send :include, ActiveSupport::Callbacks
+	    # aClass.send :define_callbacks, :update_op, :scope => [:kind, :name]
 	  end
 
 		#module ClassMethods
@@ -209,8 +210,6 @@ module Kojac
 
 		public
 
-		attr_accessor :item
-
 		def results
 			@results ||= {}
 		end
@@ -342,34 +341,35 @@ module Kojac
 			ring = current_ring
 			aResultKey ||= aItem.g? :kojac_key
 			results[aResultKey] = (aItem && KojacUtils.to_jsono(aItem,scope: kojac_current_user))
-			return unless policy = Kojac.policy!(kojac_current_user,aItem)
-			aOptions ||= {}
-			if included_assocs = aOptions[:include]
-				included_assocs = included_assocs.split(',') if included_assocs.is_a?(String)
-				included_assocs = [included_assocs] unless included_assocs.is_a?(Array)
-				included_assocs.map!(&:to_sym) if included_assocs.is_a?(Array)
-				p_assocs = policy.permitted_associations(:read)       # ***
-				use_assocs = p_assocs.delete_if do |a|
-					if included_assocs.include?(a) and ma = aItem.class.reflect_on_association(a)
-						![:belongs_to,:has_many].include?(ma.macro)   # is supported association type
-					else
-						true  # no such assoc
+			if policy = Kojac.policy!(kojac_current_user,aItem)
+				aOptions ||= {}
+				if included_assocs = aOptions[:include]
+					included_assocs = included_assocs.split(',') if included_assocs.is_a?(String)
+					included_assocs = [included_assocs] unless included_assocs.is_a?(Array)
+					included_assocs.map!(&:to_sym) if included_assocs.is_a?(Array)
+					p_assocs = policy.permitted_associations(:read)       # ***
+					use_assocs = p_assocs.delete_if do |a|
+						if included_assocs.include?(a) and ma = aItem.class.reflect_on_association(a)
+							![:belongs_to,:has_many].include?(ma.macro)   # is supported association type
+						else
+							true  # no such assoc
+						end
 					end
-				end
-				use_assocs.each do |a|
-					next unless a_contents = aItem.send(a)
-					if a_contents.is_a? Array
-						contents_h = []
-						a_contents.each do |sub_item|
-							results[sub_item.kojac_key] = KojacUtils.to_jsono(sub_item,scope: kojac_current_user)
-							#contents_h << sub_item.id
+					use_assocs.each do |a|
+						next unless a_contents = aItem.send(a)
+						if a_contents.is_a? Array
+							contents_h = []
+							a_contents.each do |sub_item|
+								results[sub_item.kojac_key] = KojacUtils.to_jsono(sub_item,scope: kojac_current_user)
+							end
+						else
+							results[a_contents.kojac_key] = KojacUtils.to_jsono(a_contents,scope: kojac_current_user)
 						end
-						#results[aResultKey] = contents_h
-					else
-						results[a_contents.kojac_key] = KojacUtils.to_jsono(a_contents,scope: kojac_current_user)
 					end
 				end
 			end
+			results_insert_filter(results,aItem,aResultKey,aOptions) if respond_to?(:results_insert_filter)
+			results
 		end
 
 		public
@@ -431,9 +431,9 @@ module Kojac
 			model = deduce_model_class
 			scope = Kojac.policy_scope(current_user, model, op) || model
 
-			if self.item = scope.load_by_key(op[:key],op)
+			if item = scope.load_by_key(op[:key],op)
 
-				run_callbacks :update_op do
+				#run_callbacks :update_op do
 					policy = Kojac.policy!(kojac_current_user,item,op)
 					item.update_permitted_attributes!(op[:value], policy)
 
@@ -460,7 +460,7 @@ module Kojac
 						#results[key] = assoc_item
 						merge_model_into_results(assoc_item,key)
 					end
-				end
+				#end
 			end
 			{
 				key: op[:key],

data/lib/kojac/version.rb

@@ -1,3 +1,3 @@
 module Kojac
-  VERSION = "0.11.0"
+  VERSION = "0.12.0"
 end

data/spec/can_cache_spec.js

@@ -6,7 +6,8 @@ describe("Kojac.CanCache Specs", function() {
 		this.kojac = new Kojac.Core({
 			cache: this.cache,
 			remoteProvider: new Kojac.RemoteProvider({useMockFileValues: true,mockFilePath: 'mockjson/'}),
-			objectFactory: factory
+			objectFactory: factory,
+			apiVersion: 1
 		});
 	});
 

data/spec/ember_factory_spec.js

@@ -71,7 +71,7 @@ describe("Ember Factory", function() {
 			}
 		];
 
-		var emberObjects = factory.emberObjectFactoryArray(source,'order_item');
+		var emberObjects = factory.manufacture(source,'order_item');
 		var emberObject = emberObjects[0];
 		expect(emberObject).toBeDefined();
 		expect(emberObject.constructor).toBe(OrderItem);

data/spec/ember_model_spec.js

@@ -28,30 +28,30 @@ describe("Kojac Ember Model", function() {
 
 	it("extend and check null values", function() {
 		var product = Product1.create();
-		expect(product.name).toBeNull();
-		expect(product.purchases).toBeNull();
-		expect(product.weight).toBeNull();
-		expect(product.isMember).toBeNull();
-		expect(product.start).toBeNull();
-		expect(Product1.getDefinitions()).toEqual(product1Values);
+		expect(product.get('name')).toBeNull();
+		expect(product.get('purchases')).toBeNull();
+		expect(product.get('weight')).toBeNull();
+		expect(product.get('isMember')).toBeNull();
+		expect(product.get('start')).toBeNull();
+		//expect(Product1.getDefinitions()).toEqual(product1Values);
 	});
 
 	it("extend and check non-null values", function() {
 		var product = Product2.create();
-		expect(product.name).toBe(product2Values.name);
-		expect(product.purchases).toBe(product2Values.purchases);
-		expect(product.weight).toBe(product2Values.weight);
-		expect(product.isMember).toBe(product2Values.isMember);
 		expect(product.get('name')).toBe(product2Values.name);
 		expect(product.get('purchases')).toBe(product2Values.purchases);
 		expect(product.get('weight')).toBe(product2Values.weight);
 		expect(product.get('isMember')).toBe(product2Values.isMember);
-		expect(Product2.getDefinitions()).toEqual({
-			name: String,
-			purchases: Int,
-			weight: Number,
-			isMember: Boolean
-		});
+		expect(product.get('name')).toBe(product2Values.name);
+		expect(product.get('purchases')).toBe(product2Values.purchases);
+		expect(product.get('weight')).toBe(product2Values.weight);
+		expect(product.get('isMember')).toBe(product2Values.isMember);
+//		expect(Product2.getDefinitions()).toEqual({
+//			name: String,
+//			purchases: Int,
+//			weight: Number,
+//			isMember: Boolean
+//		});
 	});
 
 	it("Ember.Object extend and create", function() {
@@ -98,22 +98,22 @@ describe("Kojac Ember Model", function() {
 		for (p in wrongProductValues)
 			product.set(p,wrongProductValues[p]);
 		//person.setProperties(wrongProductValues);
-		expect(product.name).toBe('123');
-		expect(product.purchases).toBe(2);
-		expect(product.weight).toBe(null);
-		expect(product.isMember).toBe(true);
-		expect(product.start).toEqual(new Date(2010,5,1,23,59,56));
+		expect(product.get('name')).toBe('123');
+		expect(product.get('purchases')).toBe(2);
+		expect(product.get('weight')).toBe(null);
+		expect(product.get('isMember')).toBe(true);
+		expect(product.get('start')).toEqual(new Date(2010,5,1,23,59,56));
 	});
 
 	it("check setProperties values requiring conversion", function() {
 		moment().zone(8);
 		var product = Product1.create();
 		product.setProperties(wrongProductValues);
-		expect(product.name).toBe('123');
-		expect(product.purchases).toBe(2);
-		expect(product.weight).toBe(null);
-		expect(product.isMember).toBe(true);
-		expect(product.start).toEqual(new Date(2010,5,1,23,59,56));
+		expect(product.get('name')).toBe('123');
+		expect(product.get('purchases')).toBe(2);
+		expect(product.get('weight')).toBe(null);
+		expect(product.get('isMember')).toBe(true);
+		expect(product.get('start')).toEqual(new Date(2010,5,1,23,59,56));
 	});
 
 	it("check init", function() {
@@ -133,16 +133,16 @@ describe("Kojac Ember Model", function() {
 				for (p in initValues) {
 					if (p=='weight')
 						continue;
-					this[p] = initValues[p];
+					this.set(p,initValues[p]);
 				}
 			}
 		};
 		var Product3 = Kojac.EmberModel.extend(productValuesWithInit);
 		var product = Product3.create();
-		expect(product.name).toBe(initValues.name);
-		expect(product.purchases).toBe(initValues.purchases);
-		expect(product.isMember).toBe(initValues.isMember);
-		expect(product.weight).toBe(productValuesWithInit.weight);
+		expect(product.get('name')).toBe(initValues.name);
+		expect(product.get('purchases')).toBe(initValues.purchases);
+		expect(product.get('isMember')).toBe(initValues.isMember);
+		expect(product.get('weight')).toBe(productValuesWithInit.weight);
 	});
 
 	it("check computed property", function() {
@@ -150,13 +150,13 @@ describe("Kojac Ember Model", function() {
 			first_name: 'Jeffery',
 			last_name: 'Watt',
 			full_name: function() {
-				return this.first_name+' '+this.last_name;
+				return this.get('first_name')+' '+this.get('last_name');
 			}.property()
 		};
 		var Cust = Ember.Object.extend(initValues);
 		var cust = Cust.create();
-		expect(cust.first_name).toBe(initValues.first_name);
-		expect(cust.last_name).toBe(initValues.last_name);
+		expect(cust.get('first_name')).toBe(initValues.first_name);
+		expect(cust.get('last_name')).toBe(initValues.last_name);
 		expect(cust.get('full_name')).toBe(initValues.first_name+' '+initValues.last_name);
 	});
 

data/spec/ember_override_spec.js

@@ -0,0 +1,81 @@
+describe("Kojac Override", function() {
+
+
+	it("meta returns the same object each time, and subclasses return a different object", function() {
+		var RndModel = Ember.Object.extend({});
+		var SubModel1 = RndModel.extend({});
+		var SubModel2 = RndModel.extend({});
+
+		expect( Ember.meta(RndModel) ).toBeTruthy();
+		expect( Ember.meta(RndModel)===Ember.meta(RndModel)).toBeTruthy();
+		expect( Ember.meta(RndModel).descs ).toBeTruthy();
+		expect( Ember.meta(RndModel).descs===Ember.meta(RndModel).descs ).toBeTruthy();
+
+		expect( Ember.meta(SubModel1) ).toBeTruthy();
+		expect( Ember.meta(SubModel1)!==Ember.meta(RndModel) ).toBeTruthy();
+		expect( Object.getPrototypeOf(Ember.meta(SubModel1))===Object.getPrototypeOf(Ember.meta(RndModel)) ).toBeTruthy();
+
+		expect( Ember.meta(SubModel1).descs ).toBeTruthy();
+		expect( Ember.meta(SubModel1).descs!==Ember.meta(RndModel).descs ).toBeTruthy();
+		expect( Object.getPrototypeOf(Ember.meta(SubModel1).descs)===Object.getPrototypeOf(Ember.meta(RndModel).descs)).toBeTruthy();
+
+		expect( Ember.meta(SubModel2) ).toBeTruthy();
+		expect( Ember.meta(SubModel2).descs ).toBeTruthy();
+		expect( Ember.meta(SubModel1)!==Ember.meta(SubModel2) ).toBeTruthy();
+		expect( Ember.meta(SubModel1).descs!==Ember.meta(SubModel2).descs ).toBeTruthy();
+	});
+
+	it("instances have their own meta", function() {
+		var RndModel = Ember.Object.extend({});
+		var rndModel = RndModel.create();
+		expect( Ember.meta(RndModel) ).toBeTruthy();
+		expect( Ember.meta(rndModel) ).toBeTruthy();
+		expect( Ember.meta(rndModel)!==Ember.meta(RndModel) ).toBeTruthy();
+	});
+
+	it("instance proto === class", function() {
+		var RndModel = Ember.Object.extend({});
+		var rndModel = RndModel.create({});
+		expect(rndModel.constructor === RndModel).toBeTruthy();
+		expect(Object.getPrototypeOf(RndModel) === Object.getPrototypeOf(Ember.Object)).toBeTruthy();
+		expect(Object.getPrototypeOf(RndModel) !== Ember.Object).toBeTruthy();
+	});
+
+	it("override get and set", function() {
+		//var RndModel = Ember.Object.extend({});
+		var SubModel1 = Kojac.EmberModel.extend({
+			name: Int
+		});
+		//var SubModel2 = RndModel.extend({});
+		var subModel1 = SubModel1.create({
+			name: 'fred'
+		});
+		console.log(subModel1.get('name'));
+		subModel1.set('name','john');
+		console.log(subModel1.get('name'));
+	});
+
+//	it("can modify class desc", function() {
+//
+//		var TestMethodType = function(aParam) {
+//      this.set = function(obj, keyName, value) {
+//	      var meta = Ember.meta(obj),
+//	    			desc = (meta && meta.descs[keyName]);
+//	    		meta.descs[keyName] = undefined;
+//	      Ember.set(obj,keyName,value+value);
+//	      meta.descs[keyName] = desc;
+//      }
+//		};
+//		TestMethodType.prototype = new Ember.Descriptor();
+//
+//		var props = {
+//			name: new TestMethodType('something')
+//		};
+//		var RndModel = Ember.Object.extend(props);
+//
+//		var rndModel = RndModel.create({});
+//		rndModel.set('name','blah');
+//		expect(rndModel.get('name')).toEqual('blahblah');
+//	});
+
+});

data/spec/ember_tojsono_spec.js

@@ -64,7 +64,7 @@ describe("EmberModel toJsono", function() {
 	
 	it("simple model with embedded object", function() {
 		var input = Product.create(productValues1);
-		input.embedded = values2;
+		input.set('embedded',values2);
 		
 		var actual = Kojac.Utils.toJsono(input);
 		

data/spec/error_handling_spec.js

@@ -8,6 +8,7 @@ describe("Error Handling (requires web server)", function() {
 		App.cache = new Kojac.Cache();
 		App.kojac = new Kojac.Core({
 			cache: App.cache,
+			apiVersion: 1,
 			remoteProvider: new Kojac.RemoteProvider({
 				serverPath: '/sdfhjdfsdfhsjkhjdfskhjdfsjhkdfsdsf',
 				timeout: 2000
@@ -44,6 +45,7 @@ describe("Error Handling (requires web server)", function() {
 		App.cache = new Kojac.Cache();
 		App.kojac = new Kojac.Core({
 			cache: App.cache,
+			apiVersion: 1,
 			remoteProvider: new Kojac.RemoteProvider({
 				//serverPath: '/sdfhjdfsdfhsjkhjdfskhjdfsjhkdfsdsf',
 				timeout: 2000

data/spec/kojac_caching_spec.js

@@ -4,7 +4,8 @@ describe("Kojac Caching", function() {
 		this.cache = new Kojac.Cache();
 		this.kojac = new Kojac.Core({
 			cache: this.cache,
-			remoteProvider: new Kojac.RemoteProvider({useMockFileValues: true,mockFilePath: 'mockjson/'})
+			remoteProvider: new Kojac.RemoteProvider({useMockFileValues: true,mockFilePath: 'mockjson/'}),
+			apiVersion: 1
 		});
 	});
 

data/spec/kojac_mock_spec.js

@@ -21,6 +21,7 @@ describe("Kojac Mock", function() {
 		]);
 		App.kojac = new Kojac.Core({
 			cache: App.cache,
+			apiVersion: 1,
 			remoteProvider: new Kojac.RemoteProvider({useMockFileValues: true, mockFilePath: 'mockjson/'}),
 			objectFactory: factory
 		});

data/spec/kojac_operations_spec.js

@@ -5,6 +5,7 @@ describe("Kojac Operations", function() {
 		var factory = new Kojac.ObjectFactory();
 		this.kojac = new Kojac.Core({
 			cache: this.cache,
+			apiVersion: 1,
 			remoteProvider: new Kojac.RemoteProvider({useMockFileValues: true, mockFilePath: 'mockjson/'}),
 			objectFactory: factory
 		});

data/spec/local_provider_spec.js

@@ -23,6 +23,7 @@ describe("LocalStorageRemoteProvider", function() {
 		]);
 		this.kojac = new Kojac.Core({
 			cache: this.cache,
+			apiVersion: 1,
 			remoteProvider: new Kojac.LocalStorageRemoteProvider(),
 			objectFactory: factory
 		});

data/spec/operation_include_spec.js

@@ -21,6 +21,7 @@ describe("Operation include spec", function() {
 		]);
 		App.kojac = new Kojac.Core({
 			cache: App.cache,
+			apiVersion: 1,
 			remoteProvider: new Kojac.RemoteProvider(),
 			objectFactory: factory
 		});

data/spec/run.html

@@ -23,8 +23,8 @@
 	<!--<script type="text/javascript" src="https://raw.github.com/bitovi/canjs/v1.1.0/view/modifiers/modifiers.js"></script>-->
 	<!--<script type="text/javascript" src="https://raw.github.com/bitovi/canjs/v1.1.0/observe/attributes/attributes.js"></script>-->
 
-	<script type="text/javascript" src="http://builds.handlebarsjs.com.s3.amazonaws.com/handlebars-v1.1.2.js"></script>
-	<script type="text/javascript" src="http://builds.emberjs.com/tags/v1.2.0/ember.js"></script>
+	<script type="text/javascript" src="http://builds.handlebarsjs.com.s3.amazonaws.com/handlebars-v1.3.0.js"></script>
+	<script type="text/javascript" src="http://builds.emberjs.com/tags/v1.6.0/ember.js"></script>
 
 	<!--<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/handlebars.js/1.0.0-rc.4/handlebars.js"></script>-->
 	<!--<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/ember.js/1.0.0-rc.6/ember.js"></script>-->
@@ -39,12 +39,13 @@
     <script type="text/javascript" src="kojac_model_spec.js"></script>
     <script type="text/javascript" src="handler_stack_spec.js"></script>
 	<script type="text/javascript" src="kojac_caching_spec.js"></script>
-	<script type="text/javascript" src="error_handling_spec.js"></script>
+	<!--<script type="text/javascript" src="error_handling_spec.js"></script>-->
 	<!--<script type="text/javascript" src="can_cache_spec.js"></script>-->
 	<!--<script type="text/javascript" src="can_model_spec.js"></script>-->
 	<!--<script type="text/javascript" src="can_factory_spec.js"></script>-->
 
 	<script type="text/javascript" src="../app/assets/javascripts/kojac_ember.js"></script>
+	<script type="text/javascript" src="ember_override_spec.js"></script>
 	<script type="text/javascript" src="ember_model_spec.js"></script>
 	<script type="text/javascript" src="ember_factory_spec.js"></script>
 	<script type="text/javascript" src="ember_tojsono_spec.js"></script>

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: kojac
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Gary McGhee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2014-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: buzztools
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: underscore_plus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: pundit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.3
 - !ruby/object:Gem::Dependency
@@ -77,7 +77,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -87,6 +87,8 @@ files:
 - app/assets/javascripts/kojac_canjs.js
 - app/assets/javascripts/kojac_ember.js
 - app/controllers/kojac_base_controller.rb
+- app/controllers/kojac_front_methods.rb
+- app/controllers/kojac_metal_controller.rb
 - app/policies/kojac_base_policy.rb
 - app/serializers/kojac_base_serializer.rb
 - diagram.odg
@@ -167,6 +169,7 @@ files:
 - spec/demo/vendor/assets/stylesheets/.keep
 - spec/ember_factory_spec.js
 - spec/ember_model_spec.js
+- spec/ember_override_spec.js
 - spec/ember_tojsono_spec.js
 - spec/error_handling_spec.js
 - spec/external.zip
@@ -223,12 +226,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -307,6 +310,7 @@ test_files:
 - spec/demo/vendor/assets/stylesheets/.keep
 - spec/ember_factory_spec.js
 - spec/ember_model_spec.js
+- spec/ember_override_spec.js
 - spec/ember_tojsono_spec.js
 - spec/error_handling_spec.js
 - spec/external.zip
@@ -351,3 +355,4 @@ test_files:
 - spec/spec.js
 - spec/support/jasmine.yml
 - spec/type_conversion_spec.js
+has_rdoc: