Skip to content

Commit

Permalink
lint before legacy build, show firebase comment in legacy build
Browse files Browse the repository at this point in the history
plus other review comment changes
  • Loading branch information
Tim Stirrat committed Feb 25, 2015
1 parent 06af460 commit 8781160
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 22 deletions.
5 changes: 3 additions & 2 deletions .jshintrc
Expand Up @@ -3,7 +3,6 @@
"document",
"window",
"-Promise",
"Firebase",
"moment",
"md5"
],
Expand Down Expand Up @@ -31,5 +30,7 @@
"white": false,
"eqnull": true,
"esnext": true,
"unused": true
"unused": "vars",
"smarttabs": true,
"bitwise": false
}
1 change: 1 addition & 0 deletions .npmignore
Expand Up @@ -9,4 +9,5 @@ tests/
**/.gitkeep
bower.json
Brocfile.js
gulpfile.js
testem.json
22 changes: 11 additions & 11 deletions addon/adapters/firebase.js
Expand Up @@ -273,18 +273,18 @@ export default DS.Adapter.extend(Ember.Evented, {
record.eachRelationship(function(key, relationship) {
var save;
if (relationship.kind === 'hasMany') {
if (serializedRecord[key]) {
save = adapter._saveHasManyRelationship(store, type, relationship, serializedRecord[key], recordRef, recordCache);
savedRelationships.push(save);
// Remove the relationship from the serializedRecord because otherwise we would clobber the entire hasMany
delete serializedRecord[key];
}
if (serializedRecord[key]) {
save = adapter._saveHasManyRelationship(store, type, relationship, serializedRecord[key], recordRef, recordCache);
savedRelationships.push(save);
// Remove the relationship from the serializedRecord because otherwise we would clobber the entire hasMany
delete serializedRecord[key];
}
} else {
if (relationship.options.embedded === true && serializedRecord[key]) {
save = adapter._saveBelongsToRecord(store, type, relationship, serializedRecord[key], recordRef);
savedRelationships.push(save);
delete serializedRecord[key];
}
if (relationship.options.embedded === true && serializedRecord[key]) {
save = adapter._saveBelongsToRecord(store, type, relationship, serializedRecord[key], recordRef);
savedRelationships.push(save);
delete serializedRecord[key];
}
}
});

Expand Down
15 changes: 12 additions & 3 deletions gulpfile.js
Expand Up @@ -6,6 +6,13 @@ var sourcemaps = require('gulp-sourcemaps');
var transpile = require('gulp-es6-module-transpiler');
var concat = require('gulp-concat');
var uglify = require('gulp-uglify');
var jshint = require('gulp-jshint');

gulp.task('lint', function () {
return gulp.src('{addon,app,blueprints,config,tests}/**/*.js')
.pipe(jshint())
.pipe(jshint.reporter('default'));
});

gulp.task('clean-dist', function (cb) {
del([
Expand All @@ -14,7 +21,7 @@ gulp.task('clean-dist', function (cb) {
], cb);
});

gulp.task('build-legacy', function() {
gulp.task('build-legacy', ['lint'], function() {
return gulp.src('vendor/legacy-shims/emberfire.js')
.pipe(sourcemaps.init())
.pipe(transpile({
Expand All @@ -26,14 +33,16 @@ gulp.task('build-legacy', function() {
.pipe(gulp.dest('dist'));
});

gulp.task('build-legacy-minified', function() {
gulp.task('build-legacy-minified', ['lint'], function() {
return gulp.src('vendor/legacy-shims/emberfire.js')
.pipe(transpile({
importPaths: ['vendor/legacy-shims'], // for 'ember' and 'ember-data' global shims
formatter: 'bundle'
}))
.pipe(concat('emberfire.min.js'))
.pipe(uglify())
.pipe(uglify({
preserveComments: 'some'
}))
.pipe(gulp.dest('dist'));
});

Expand Down
1 change: 1 addition & 0 deletions package.json
Expand Up @@ -54,6 +54,7 @@
"gulp": "^3.8.11",
"gulp-concat": "^2.5.1",
"gulp-es6-module-transpiler": "^0.2.1",
"gulp-jshint": "^1.9.2",
"gulp-sourcemaps": "^1.3.0",
"gulp-uglify": "^1.1.0"
}
Expand Down
11 changes: 5 additions & 6 deletions vendor/legacy-shims/emberfire.js
@@ -1,3 +1,8 @@
import Ember from 'ember';
import FirebaseAdapter from '../../addon/adapters/firebase';
import FirebaseSerializer from '../../addon/serializers/firebase';
import EmberFireInitializer from '../../addon/initializers/emberfire';

/*!
* EmberFire is the officially supported adapter for using Firebase with
* Ember Data. The DS.FirebaseAdapter provides all of the standard DS.Adapter
Expand All @@ -7,12 +12,6 @@
* https://github.com/firebase/emberfire/
* License: MIT
*/

import Ember from 'ember';
import FirebaseAdapter from '../../addon/adapters/firebase';
import FirebaseSerializer from '../../addon/serializers/firebase';
import EmberFireInitializer from '../../addon/initializers/emberfire';

window.DS.FirebaseAdapter = FirebaseAdapter;
window.DS.FirebaseSerializer = FirebaseSerializer;

Expand Down

0 comments on commit 8781160

Please sign in to comment.