Skip to content

Commit

Permalink
actualizo versiones
Browse files Browse the repository at this point in the history
  • Loading branch information
emilioplatzer committed Mar 28, 2017
1 parent bff1795 commit e60729c
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 26 deletions.
8 changes: 4 additions & 4 deletions .eslintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ rules:
default-case: 0
dot-location: 0
dot-notation: 0
eqeqeq: 2
eqeqeq: 0
guard-for-in: 2
no-alert: 2
no-caller: 2
no-case-declarations: 2
no-div-regex: 2
no-else-return: 0
no-empty-pattern: 2
no-eq-null: 2
no-eq-null: 0
no-eval: 2
no-extend-native: 2
no-extra-bind: 2
Expand Down Expand Up @@ -99,7 +99,7 @@ rules:
yoda: 0

# Strict
strict: "error"
strict: 2

# Variables
init-declarations: 0
Expand Down Expand Up @@ -148,7 +148,7 @@ rules:
max-len: 0
max-nested-callbacks: 0
max-params: 0
max-statements: [2, 30]
max-statements: [2, 35]
new-cap: 0
new-parens: 0
newline-after-var: 0
Expand Down
1 change: 1 addition & 0 deletions .jshintrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"asi": false,
"forin": true,
"curly": true,
"eqnull": true,
"node": true,
"strict": "global",
"predef": [ "module" ]
Expand Down
18 changes: 9 additions & 9 deletions LEEME.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ console.log(JSON.stringify(discrepances(a, b)));
$ npm install discrepances
```

<!-- cucardas -->
![designing](https://img.shields.io/badge/stability-designing-red.svg)
[![npm-version](https://img.shields.io/npm/v/discrepances.svg)](https://npmjs.org/package/discrepances)
[![downloads](https://img.shields.io/npm/dm/discrepances.svg)](https://npmjs.org/package/discrepances)
[![build](https://img.shields.io/travis/codenautas/discrepances/master.svg)](https://travis-ci.org/codenautas/discrepances)
[![coverage](https://img.shields.io/coveralls/codenautas/discrepances/master.svg)](https://coveralls.io/r/codenautas/discrepances)
[![climate](https://img.shields.io/codeclimate/github/codenautas/discrepances.svg)](https://codeclimate.com/github/codenautas/discrepances)
[![dependencies](https://img.shields.io/david/codenautas/discrepances.svg)](https://david-dm.org/codenautas/discrepances)
[![qa-control](http://codenautas.com/github/codenautas/discrepances.svg)](http://codenautas.com/github/codenautas/discrepances)
<!-- cucardas -->
![extending](https://img.shields.io/badge/stability-extending-orange.svg)
[![npm-version](https://img.shields.io/npm/v/discrepances.svg)](https://npmjs.org/package/discrepances)
[![downloads](https://img.shields.io/npm/dm/discrepances.svg)](https://npmjs.org/package/discrepances)
[![build](https://img.shields.io/travis/codenautas/discrepances/master.svg)](https://travis-ci.org/codenautas/discrepances)
[![coverage](https://img.shields.io/coveralls/codenautas/discrepances/master.svg)](https://coveralls.io/r/codenautas/discrepances)
[![climate](https://img.shields.io/codeclimate/github/codenautas/discrepances.svg)](https://codeclimate.com/github/codenautas/discrepances)
[![dependencies](https://img.shields.io/david/codenautas/discrepances.svg)](https://david-dm.org/codenautas/discrepances)
[![qa-control](http://codenautas.com/github/codenautas/discrepances.svg)](http://codenautas.com/github/codenautas/discrepances)


<!--multilang buttons-->
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ console.log(JSON.stringify(discrepances(a, b)));
$ npm install discrepances
```

![designing](https://img.shields.io/badge/stability-designing-red.svg)
![extending](https://img.shields.io/badge/stability-extending-orange.svg)
[![npm-version](https://img.shields.io/npm/v/discrepances.svg)](https://npmjs.org/package/discrepances)
[![downloads](https://img.shields.io/npm/dm/discrepances.svg)](https://npmjs.org/package/discrepances)
[![build](https://img.shields.io/travis/codenautas/discrepances/master.svg)](https://travis-ci.org/codenautas/discrepances)
Expand Down
26 changes: 15 additions & 11 deletions lib/discrepances.js
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ function nestedObject(a, b, opts){
} else {
return compare('types',typeA,typeB,a,b);
}
};
}

function keying(falto, object, prefix){
var isContainer=false;
Expand All @@ -282,7 +282,9 @@ function keying(falto, object, prefix){
if(object && container.name in object){
var innerObject=object[container.name];
for(var attr in innerObject){
keying(falto, innerObject[attr], prefix+container.left+attr+container.right);
if(innerObject.hasOwnProperty(attr)){
keying(falto, innerObject[attr], prefix+container.left+attr+container.right);
}
}
isContainer=true;
}
Expand All @@ -298,32 +300,34 @@ discrepances = function discrepances(){
var message="DEPRECATED! Discrepances is no more a function. Use discprepances.showAndThrow or discrepances.nestedObject";
console.log(message);
throw new Error(message);
}
};

discrepances.flatten = function flatten(a, b, opts){
var nested = nestedObject(a, b, opts);
var falto={};
keying(falto, nested, "");
return falto;
}
};

discrepances.showAndThrow = function showAndThrow(a, b, opts){
var keyDiffs = discrepances.flatten(a, b, opts);
var firstError;
for(var attr in keyDiffs){
if(!firstError){
try{
firstError=attr+":"+JSON.stringify(keyDiffs[attr]);
}catch(err){
firstError=attr+":"+keyDiffs[attr];
if(keyDiffs.hasOwnProperty(attr)){
if(!firstError){
try{
firstError=attr+":"+JSON.stringify(keyDiffs[attr]);
}catch(err){
firstError=attr+":"+keyDiffs[attr];
}
}
console.log(attr, keyDiffs[attr]);
}
console.log(attr, keyDiffs[attr]);
}
if(firstError){
throw new Error("discrepances in "+firstError);
}
}
};

discrepances.nestedObject = nestedObject;

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "discrepances",
"description": "show discrepances in several flavors",
"version": "0.1.2",
"version": "0.1.3",
"author": "Codenautas <codenautas@googlegroups.com>",
"repository": "codenautas/discrepances",
"license": "MIT",
Expand Down

0 comments on commit e60729c

Please sign in to comment.