Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions facet.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ var DatabaseError = require("./errors").DatabaseError,
substitute = require("json-schema/lib/validate").substitute,
rpcInvoke = require("./json-rpc").invoke;
require("./coerce");// patches json-schema
require("./util/ringojs-compat"); // compatibility package for ringojs

exports.Facet = Facet;
Facet.facetFor = function(store, resolver, mediaType){
Expand Down Expand Up @@ -287,7 +288,7 @@ function FacetedStore(store, facetSchema){
}
};

constructor.__proto__ = httpHandlerPrototype;
constructor = Object.setPrototypeOf ( constructor, httpHandlerPrototype );

// TODO: handle immutable proto
return constructor;
Expand Down Expand Up @@ -354,12 +355,14 @@ var SchemaControlled = function(facetSchema, sourceClass, permissive){
var results = LazyArray({
some: function(callback){
source.some(function(item){
callback((item && typeof item == "object" && wrap(item, transaction, item, true)) || item);
return callback((item && typeof item == "object" && wrap(item, transaction, item, true)) || item);
});
},
length: source.length
});
results.totalCount = source.totalCount;
if ( source.lazy == false )
results = results.toRealArray ();
return results;
}
var instancePrototype = Object.create(facetPrototype);
Expand Down Expand Up @@ -543,6 +546,7 @@ var SchemaControlled = function(facetSchema, sourceClass, permissive){
}
}
}

for(var i in needSourceParameter){
// splice in the source argument for each method that needs it
(function(param, protoFunc, i){
Expand All @@ -553,12 +557,12 @@ var SchemaControlled = function(facetSchema, sourceClass, permissive){
})(needSourceParameter[i], facetPrototype[i], i);
}
if(writableProto && partial === true){
source.__proto__ = instancePrototype;
source = Object.setPrototypeOf ( source, instancePrototype );
wrapped = source;
}
else{
if(wrapped){
wrapped.__proto__ = instancePrototype;
wrapped = Object.setPrototypeOf ( wrapped, instancePrototype );
}
else{
wrapped = Object.create(instancePrototype);
Expand Down Expand Up @@ -627,7 +631,7 @@ function Facet(appliesTo, schema, permissive){
facetedStore = function(){
return facetedStore.construct.apply(facetedStore, arguments);
};
facetedStore.__proto__ = baseFacetedStore;
facetedStore = Object.setPrototypeOf ( facetedStore, baseFacetedStore );
facetedStore.wrap = createWrap(facetedStore);
}
else{
Expand Down
24 changes: 24 additions & 0 deletions util/ringojs-compat.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// Polyfill for __proto__ and Object.setPrototypeOf
// see http://stackoverflow.com/questions/10476560/proto-when-will-it-be-gone-alternatives
// and https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/setPrototypeOf
// and https://github.com/ringo/ringojs/issues/181
var testobj = {};
Object.setPrototypeOf = Object.setPrototypeOf || function ( obj, proto ) {
if ( testobj.__proto__ ) {
obj.__proto__ = proto;
return obj;
}
var type = typeof proto;
if ( ( typeof obj == "object" || typeof obj == "function" ) && ( type == "object" || type == "function" ) ) {
var constructor = function ( obj ) {
var ownPropertyNames = Object.getOwnPropertyNames ( obj );
var length = ownPropertyNames.length;
for ( var i = 0; i < length; i++ ) {
var ownPropertyName = ownPropertyNames[i];
this[ownPropertyName] = obj[ownPropertyName];
}
};
constructor.prototype = proto;
return new constructor(obj);
} else throw new TypeError ( "Expected both the arguments to be objects." );
}