finish up tests and tweaks, changelog

Gruntfile.js

@@ -1,33 +1,10 @@
-var fs = require('fs');
+module.exports = function (grunt) {
 
-module.exports = function(grunt) {
-
-  // Project configuration.
+  // Project configuration
   grunt.initConfig({
     pkg: grunt.file.readJSON('package.json'),
 
-    jshint: {
-      options: {
-        jshintrc: '.jshintrc'
-      },
-      all: {
-        src: [
-          'src/**/*.js'
-        ]
-      }
-    },
-
     watch: {
-      scripts: {
-        files: [
-          'src/**/*.js',
-          'spec/**/*.js'
-        ],
-        tasks: ['jshint'],
-        options: {
-          spawn: false
-        }
-      },
       'docs-sass': {
         files: ['site/source/scss/**/*.scss'],
         tasks: ['sass'],
@@ -63,97 +40,7 @@ module.exports = function(grunt) {
       options: {
         logConcurrentOutput: true
       },
-      dev: ['watch:scripts', 'karma:watch', 'docs']
-    },
-
-    concat: {
-      options: {
-        sourceMap: true,
-        separator: '\n\n',
-        banner: copyright + umdHeader,
-        footer: umdFooter,
-      },
-      complete: {
-        src: complete,
-        dest: 'dist/esri-leaflet-src.js'
-      },
-      core: {
-        src: core,
-        dest: 'dist/builds/core/esri-leaflet-core-src.js'
-      },
-      basemaps: {
-        src: basemaps,
-        dest: 'dist/builds/basemaps/esri-leaflet-basemaps-src.js'
-      },
-      mapservice: {
-        src: mapservice,
-        dest: 'dist/builds/map-service/esri-leaflet-map-service-src.js'
-      },
-      imageservice: {
-        src: imageservice,
-        dest: 'dist/builds/image-service/esri-leaflet-image-service-src.js'
-      },
-      featureservice: {
-        src: featureservice,
-        dest: 'dist/builds/feature-layer/esri-leaflet-feature-layer-src.js'
-      }
-    },
-
-    uglify: {
-      options: {
-        sourceMap: true,
-        sourceMapIncludeSources: true,
-        wrap: false,
-        mangle: {
-          except: ['L']
-        },
-        preserveComments: 'some',
-        report: 'gzip',
-        banner: copyright + umdHeader,
-        footer: umdFooter,
-      },
-      dist: {
-        files: {
-          'dist/esri-leaflet.js': complete,
-          'dist/builds/core/esri-leaflet-core.js': core,
-          'dist/builds/basemaps/esri-leaflet-basemaps.js': basemaps,
-          'dist/builds/map-service/esri-leaflet-map-service.js': mapservice,
-          'dist/builds/image-service/esri-leaflet-image-service.js': imageservice,
-          'dist/builds/feature-layer/esri-leaflet-feature-layer.js': featureservice
-        }
-      }
-    },
-
-    karma: {
-      options: {
-        configFile: 'karma.conf.js'
-      },
-      run: {
-        reporters: ['progress'],
-        browsers: browsers,
-        logLevel: 'ERROR'
-      },
-      coverage: {
-        reporters: ['progress', 'coverage'],
-        browsers: browsers,
-        preprocessors: {
-          'src/**/*.js': ['sourcemap', 'coverage']
-        }
-      },
-      watch: {
-        singleRun: false,
-        autoWatch: true,
-        browsers: browsers
-      },
-      sauce: {
-        sauceLabs: {
-          testName: 'Esri Leaflet Unit Tests'
-        },
-        customLaunchers: customLaunchers,
-        browsers: Object.keys(customLaunchers),
-        reporters: ['progress', 'saucelabs'],
-        singleRun: true
-      }
+      dev: ['karma:watch', 'docs']
     },
 
     connect: {
@@ -238,30 +125,14 @@ module.exports = function(grunt) {
         repo: '[email protected]:Esri/esri-leaflet.git'
       },
       src: ['**']
-    },
-
-    releaseable: {
-      release: {
-        options: {
-          remote: 'upstream',
-          dryRun: grunt.option('dryRun') ? grunt.option('dryRun') : false,
-          silent: false
-        },
-        src: [ 'dist/**/*.js','dist/**/*.map' ]
-      }
     }
   });
 
   // Development Tasks
-  grunt.registerTask('default', ['concurrent:dev']);
-  grunt.registerTask('build', ['jshint', 'karma:coverage', 'concat', 'uglify']);
-  grunt.registerTask('test', ['jshint', 'karma:run']);
-  grunt.registerTask('prepublish', ['concat', 'uglify']);
-  grunt.registerTask('release', ['releaseable']);
-  grunt.registerTask('test:sauce', ['karma:sauce']);
+  grunt.registerTask('default', ['docs']);
 
   // Documentation Site Tasks
-  grunt.registerTask('docs', ['assemble:dev', 'concat', 'uglify', 'sass', 'copy', 'connect:docs', 'watch']);
+  grunt.registerTask('docs', ['assemble:dev', 'sass', 'copy', 'connect:docs', 'watch']);
 
   // Documentation Site Tasks
   grunt.registerTask('docs:build', ['assemble:build', 'copy', 'imagemin','sass', 'gh-pages']);

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "esri-leaflet",
-  "version": "v1.0.0",
+  "version": "v2.0.0-beta.1",
   "main": "dist/esri-leaflet.js",
   "ignore": [
     "**/.*",

karma.conf.js

@@ -1,7 +1,7 @@
 // Karma configuration
 // Generated on Fri May 30 2014 15:44:45 GMT-0400 (EDT)
 
-module.exports = function(config) {
+module.exports = function (config) {
   config.set({
 
     // base path that will be used to resolve all patterns (eg. files, exclude)
@@ -63,13 +63,19 @@ module.exports = function(config) {
 
     // Configure the coverage reporters
     coverageReporter: {
-      instrumenters: {isparta: require('isparta')},
+      instrumenters: {
+        isparta: require('isparta')
+      },
       instrumenter: {
-          'src/**/*.js': 'isparta'
+        'src/**/*.js': 'isparta'
       },
-      reporters:[
-        {type: 'html', dir:'coverage/'},
-        {type: 'text'}
+      reporters: [
+        {
+          type: 'html',
+          dir: 'coverage/'
+        }, {
+          type: 'text'
+        }
       ]
     }
   });

package.json

@@ -1,7 +1,7 @@
 {
   "name": "esri-leaflet",
-  "description": "Leaflet plugins for consuming ArcGIS Online and ArcGIS Server services",
-  "version": "2.0.0",
+  "description": "Leaflet plugins for consuming ArcGIS Online and ArcGIS Server services.",
+  "version": "2.0.0-beta.1",
   "author": "Patrick Arlt <[email protected]> (http://patrickarlt.com)",
   "browserify": {
     "transform": [
@@ -16,12 +16,12 @@
     "John Gravois <[email protected]> (http://johngravois.com)"
   ],
   "dependencies": {
-    "leaflet": "git://github.com/Leaflet/Leaflet.git#master"
+    "leaflet": "1.0.0-beta.1"
   },
   "devDependencies": {
     "assemble": "^0.4.37",
+    "babelify": "^6.1.3",
     "esperanto": "^0.7.3",
-    "exorcist": "^0.4.0",
     "gh-release": "^2.0.0",
     "grunt": "^0.4.2",
     "grunt-concurrent": "^0.5.0",
@@ -45,8 +45,7 @@
     "rollup": "^0.10.0",
     "semistandard": "^6.1.2",
     "sinon": "^1.11.1",
-    "uglify-js": "^2.4.23",
-    "yargs": "^3.15.0"
+    "uglify-js": "^2.4.23"
   },
   "homepage": "http://esri.github.io/esri-leaflet",
   "jsnext:main": "./index.js",
@@ -75,14 +74,13 @@
     "url": "[email protected]:Esri/esri-leaflet.git"
   },
   "scripts": {
-    "postinstall": "./scripts/install.js",
     "archive": "zip -r ./dist/esri-leaflet-v$(node --eval \"console.log(require('./package.json').version);\") ./dist/esri-leaflet.js ./dist/esri-leaflet.js.map",
     "prerelease": "npm run build",
     "release": "gh-release --dry-run --assets ./dist/esri-leaflet-v$(node --eval \"console.log(require('./package.json').version);\")",
     "build": "./scripts/build.js",
     "postbuild": "npm run archive",
     "prepublish": "npm run build",
-    "start": "grunt dev",
+    "start": "grunt",
     "lint": "semistandard src/**/*.js",
     "pretest": "npm run lint && esperanto -i src/EsriLeaflet.js -o ./dist/esri-leaflet-src.js --skip=leaflet --t umd --strict --name L.esri --bundle -m inline",
     "test": "karma start"

scripts/build.js

@@ -2,7 +2,7 @@
 
 var esperanto = require('esperanto');
 var path = require('path');
-var UglifyJS = require('uglify-js');
+var minify = require('uglify-js').minify;
 var fs = require('fs');
 var pkg = require('../package.json');
 
@@ -14,24 +14,25 @@ var copyright = '/*! ' + pkg.name + ' - v' + pkg.version + ' - ' + new Date().to
 esperanto.bundle({
   entry: path.resolve('src/EsriLeaflet.js'),
   skip: ['leaflet']
-}).then(function (bundle){
+}).then(function (bundle) {
   var transpiled = bundle.toUmd({
     strict: true,
     sourceMap: true,
     sourceMapFile: './esri-leaflet-src.js',
-    name: 'L.esri',
-    amdName: 'EsriLeaflet'
+    name: 'L.esri'
   });
 
-  var compressed = UglifyJS.minify(transpiled.code, {
+  var compressed = minify(transpiled.code, {
     fromString: true,
     inSourceMap: JSON.parse(transpiled.map),
     outSourceMap: './esri-leaflet.js.map'
   });
 
   fs.writeFileSync(path.join('dist', 'esri-leaflet.js'), copyright + compressed.code);
   fs.writeFileSync(path.join('dist', 'esri-leaflet.js.map'), compressed.map);
+  process.exit(0);
 
-}).catch(function (error){
+}).catch(function (error) {
   console.log(error);
+  process.exit(1);
 });

spec/Layers/FeatureLayer/FeatureLayerSpec.js

@@ -407,4 +407,28 @@ describe('L.esri.Layers.FeatureLayer', function () {
     expect(spy.getCall(0).args[0].foo).to.equal('bar');
     expect(spy.getCall(0).args[0].type).to.equal('click');
   });
+
+  it('should pass renderer through to individual features', function(){
+    var renderer = L.canvas();
+    layer = L.esri.featureLayer({
+      url: 'http://gis.example.com/mock/arcgis/rest/services/MockService/MockFeatureServer/0',
+      renderer: renderer
+    }).addTo(map);
+
+    layer.createLayers(features);
+
+    expect(layer.getFeature(1).options.renderer).to.equal(renderer);
+  });
+
+  it('should pass pane through to individual features', function(){
+    map.createPane('custom');
+    layer = L.esri.featureLayer({
+      url: 'http://gis.example.com/mock/arcgis/rest/services/MockService/MockFeatureServer/0',
+      pane: 'custom'
+    }).addTo(map);
+
+    layer.createLayers(features);
+
+    expect(layer.getFeature(1).options.pane).to.equal('custom');
+  });
 });