Updating ember cli version

.npmignore

@@ -1,15 +1,16 @@
-bower_components/
-tests/
-tmp/
-dist/
-
+/bower_components
+/config/ember-try.js
+/dist
+/tests
+/tmp
+**/.gitkeep
 .bowerrc
 .editorconfig
 .ember-cli
+.gitignore
+.jshintrc
+.watchmanconfig
 .travis.yml
-.npmignore
-**/.gitkeep
 bower.json
 ember-cli-build.js
-Brocfile.js
-testem.json
+testem.js

.travis.yml

@@ -11,6 +11,7 @@ cache:
 
 env:
   - EMBER_TRY_SCENARIO=default
+  - EMBER_TRY_SCENARIO=ember-1.13
   - EMBER_TRY_SCENARIO=ember-release
   - EMBER_TRY_SCENARIO=ember-beta
   - EMBER_TRY_SCENARIO=ember-canary

.watchmanconfig

@@ -1,3 +1,3 @@
 {
-  "ignore_dirs": ["tmp"]
+  "ignore_dirs": ["tmp", "dist"]
 }

LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015
+Copyright (c) 2016
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

README.md

@@ -32,7 +32,7 @@ In order to use this addon you just have to use the component in your templates.
 ```
 
 You can supply your own Google API key in `config/environment.js`:
- 
+
 ```js
 ENV['place-autocomplete'] = {
   key: 'AIZ...'
@@ -174,7 +174,7 @@ window.google.maps.places = {
 * Visit your app at http://localhost:4200.
 
 ## Running Tests
-
+* `npm test` (Runs `ember try:testall` to test your addon against multiple Ember versions)
 * `ember test`
 * `ember test --server`
 

addon/components/place-autocomplete-field.js

@@ -1,7 +1,7 @@
 import Ember from 'ember';
 import layout from '../templates/components/place-autocomplete-field';
 
-const { Component, isEmpty, isPresent, typeOf, isEqual } = Ember;
+const { Component, isEmpty, isPresent, typeOf, isEqual, run } = Ember;
 
 export default Component.extend({
   layout: layout,
@@ -13,33 +13,39 @@ export default Component.extend({
 
   didInsertElement() {
     this._super(...arguments);
+    run.scheduleOnce('afterRender', this, 'setupComponent');
+  },
+
+  setupComponent() {
     this.getAutocomplete();
     this.get('autocomplete').addListener('place_changed', this.placeChanged.bind(this));
   },
 
+
   willDestroy() {
     if (isPresent(this.get('autocomplete'))) {
       let google = this.get('google') || window.google;
       google.maps.event.clearInstanceListeners(this.get('autocomplete'));
     }
   },
 
-  getAutocomplete(){
+  getAutocomplete() {
     if(isEmpty(this.get('autocomplete'))){
       let inputElement = document.getElementById(this.elementId).getElementsByTagName('input')[0],
-          google = this.get('google') || window.google; //TODO: check how to use the inyected google object
-      this.set('autocomplete', new google.maps.places.Autocomplete(inputElement,
-        { types: this._typesToArray(), componentRestrictions: this.get('restrictions') }));
+          google = this.get('google') || window.google, //TODO: check how to use the inyected google object
+          autocomplete = new google.maps.places.Autocomplete(inputElement, { types: this._typesToArray(), componentRestrictions: this.get('restrictions') });
+      this.set('autocomplete', autocomplete);
     }
   },
 
   placeChanged() {
-    this._callCallback('placeChangedCallback');
+    let place =  this.get('autocomplete').getPlace();
+    this._callCallback('placeChangedCallback', place);
+    this.set('value', place.formatted_address);
   },
 
-  _callCallback(callback) {
+  _callCallback(callback, place) {
     let callbackFn = this.attrs[callback];
-    let place      = this.get('autocomplete').getPlace();
     if (isEqual(typeOf(callbackFn), 'function')) {
       callbackFn(place);
     } else {

bower.json

@@ -1,14 +1,17 @@
 {
   "name": "ember-place-autocomplete",
   "dependencies": {
-    "ember": "~2.2.0",
-    "ember-cli-shims": "0.0.6",
-    "ember-cli-test-loader": "0.2.1",
-    "ember-data": "~2.2.0",
+    "ember": "~2.5.0",
+    "ember-cli-shims": "0.1.1",
+    "ember-cli-test-loader": "0.2.2",
     "ember-load-initializers": "0.1.7",
     "ember-resolver": "~0.1.20",
-    "jquery": "^1.11.3",
-    "loader.js": "3.4.0",
-    "ember-mocha": "~0.8.0"
+    "jquery": "1.11.3",
+    "loader.js": "ember-cli/loader.js#3.4.0",
+    "qunit": "~1.20.0",
+    "mocha": "~2.2.4",
+    "chai": "~2.3.0",
+    "ember-mocha-adapter": "~0.3.1",
+    "bind-polyfill": "^1.0.0"
   }
 }

config/ember-try.js

@@ -1,34 +1,54 @@
+/*jshint node:true*/
 module.exports = {
   scenarios: [
     {
       name: 'default',
-      dependencies: { }
+      bower: {
+        dependencies: { }
+      }
+    },
+    {
+      name: 'ember-1.13',
+      bower: {
+        dependencies: {
+          'ember': '~1.13.0'
+        },
+        resolutions: {
+          'ember': '~1.13.0'
+        }
+      }
     },
     {
       name: 'ember-release',
-      dependencies: {
-        'ember': 'components/ember#release'
-      },
-      resolutions: {
-        'ember': 'release'
+      bower: {
+        dependencies: {
+          'ember': 'components/ember#release'
+        },
+        resolutions: {
+          'ember': 'release'
+        }
       }
     },
     {
       name: 'ember-beta',
-      dependencies: {
-        'ember': 'components/ember#beta'
-      },
-      resolutions: {
-        'ember': 'beta'
+      bower: {
+        dependencies: {
+          'ember': 'components/ember#beta'
+        },
+        resolutions: {
+          'ember': 'beta'
+        }
       }
     },
     {
       name: 'ember-canary',
-      dependencies: {
-        'ember': 'components/ember#canary'
-      },
-      resolutions: {
-        'ember': 'canary'
+      bower: {
+        dependencies: {
+          'ember': 'components/ember#canary'
+        },
+        resolutions: {
+          'ember': 'canary'
+        }
       }
     }
   ]

config/environment.js

@@ -1,3 +1,4 @@
+/*jshint node:true*/
 'use strict';
 
 module.exports = function(/* environment, appConfig */) {

ember-cli-build.js

@@ -1,13 +1,14 @@
+/*jshint node:true*/
 /* global require, module */
-var EmberApp = require('ember-cli/lib/broccoli/ember-addon');
+var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 
 module.exports = function(defaults) {
-  var app = new EmberApp(defaults, {
+  var app = new EmberAddon(defaults, {
     // Add options here
   });
 
   /*
-    This build file specifes the options for the dummy test app of this
+    This build file specifies the options for the dummy test app of this
     addon, located in `/tests/dummy`
     This build file does *not* influence how the addon or the app using it
     behave. You most likely want to be modifying `./index.js` or app's build file

package.json

@@ -9,7 +9,7 @@
   "scripts": {
     "build": "ember build",
     "start": "ember server",
-    "test": "ember try:testall"
+    "test": "ember try:each"
   },
   "repository": "https://github.com/dmuneras/ember-place-autocomplete",
   "engines": {
@@ -18,35 +18,32 @@
   "author": "Daniel Múnera Sánchez",
   "license": "MIT",
   "devDependencies": {
-    "broccoli-asset-rev": "^2.1.2",
-    "ember-cli": "1.13.13",
+    "broccoli-asset-rev": "^2.4.2",
+    "ember-ajax": "0.7.1",
+    "ember-cli": "2.5.0",
     "ember-cli-app-version": "^1.0.0",
-    "ember-cli-content-security-policy": "0.4.0",
-    "ember-cli-dependency-checker": "^1.0.1",
-    "ember-cli-htmlbars-inline-precompile": "0.3.1",
-    "ember-cli-ic-ajax": "0.2.4",
-    "ember-cli-inject-live-reload": "^1.3.1",
+    "ember-cli-dependency-checker": "^1.2.0",
+    "ember-cli-htmlbars-inline-precompile": "^0.3.1",
+    "ember-cli-inject-live-reload": "^1.4.0",
+    "ember-cli-jshint": "^1.0.0",
+    "ember-cli-mocha": "0.10.4",
     "ember-cli-release": "0.2.8",
-    "ember-cli-sri": "^1.2.0",
+    "ember-cli-sri": "^2.1.0",
     "ember-cli-uglify": "^1.2.0",
-    "ember-data": "~2.2.0",
-    "ember-disable-proxy-controllers": "^1.0.0",
-    "ember-export-application-global": "^1.0.3",
-    "ember-disable-prototype-extensions": "^1.0.0",
-    "ember-try": "0.0.8",
-    "ember-cli-mocha": "0.9.8"
+    "ember-data": "^2.5.0",
+    "ember-disable-prototype-extensions": "^1.1.0",
+    "ember-export-application-global": "^1.0.5",
+    "ember-load-initializers": "^0.5.1",
+    "ember-resolver": "^2.0.3",
+    "ember-try": "0.2.4",
+    "loader.js": "^4.0.1"
   },
   "keywords": [
-    "ember-addon",
-    "google places api",
-    "autocomplete",
-    "ember",
-    "address",
-    "place"
+    "ember-addon"
   ],
   "dependencies": {
-    "ember-cli-babel": "^5.1.3",
-    "ember-cli-htmlbars": "^1.0.1"
+    "ember-cli-babel": "^5.1.6",
+    "ember-cli-htmlbars": "^1.0.3"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config"

testem.js

@@ -0,0 +1,13 @@
+/*jshint node:true*/
+module.exports = {
+  "framework": "qunit",
+  "test_page": "tests/index.html?hidepassed",
+  "disable_watching": true,
+  "launch_in_ci": [
+    "PhantomJS"
+  ],
+  "launch_in_dev": [
+    "PhantomJS",
+    "Chrome"
+  ]
+};

tests/acceptance/place-autocomplete-field-test.js

@@ -9,12 +9,36 @@ import { expect, assert } from 'chai';
 import Ember from 'ember';
 
 import startApp from '../helpers/start-app';
+import GooglePlaceAutocompleteMock from './google-place-autocomplete-mock';
 
 describe('Acceptance : place autocomplete', function() {
   var application;
 
   beforeEach(function() {
+
+    // Mock only google places
+    window.google.maps.places = {
+      Autocomplete() {
+        return {
+          addListener(event, f) {
+            f.call();
+          },
+          getPlace() {
+            return GooglePlaceAutocompleteMock;
+          }
+        };
+      }
+    };
     application = startApp();
+
+    // PhantomJS doesn't support bind yet
+    // see https://github.com/ariya/phantomjs/issues/10522
+    Function.prototype.bind = Function.prototype.bind || function (thisp) {
+        let fn = this;
+        return function() {
+          return fn.apply(thisp, arguments);
+        };
+    };
   });
 
   afterEach(function() {

tests/dummy/app/app.js

@@ -1,16 +1,16 @@
 import Ember from 'ember';
-import Resolver from 'ember/resolver';
-import loadInitializers from 'ember/load-initializers';
+import Resolver from './resolver';
+import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
 
-var App;
+let App;
 
 Ember.MODEL_FACTORY_INJECTIONS = true;
 
 App = Ember.Application.extend({
   modulePrefix: config.modulePrefix,
   podModulePrefix: config.podModulePrefix,
-  Resolver: Resolver
+  Resolver
 });
 
 loadInitializers(App, config.modulePrefix);

tests/dummy/app/index.html

@@ -7,19 +7,19 @@
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    {{content-for 'head'}}
+    {{content-for "head"}}
 
     <link rel="stylesheet" href="assets/vendor.css">
     <link rel="stylesheet" href="assets/dummy.css">
 
-    {{content-for 'head-footer'}}
+    {{content-for "head-footer"}}
   </head>
   <body>
-    {{content-for 'body'}}
+    {{content-for "body"}}
 
     <script src="assets/vendor.js"></script>
     <script src="assets/dummy.js"></script>
 
-    {{content-for 'body-footer'}}
+    {{content-for "body-footer"}}
   </body>
 </html>