Merge pull request #2880 from jakesjews/master

Rename the local files to use dashes instead of underscores. Relates to issue #2877

Brocfile.js

@@ -137,7 +137,7 @@ var bower = pickFiles('bower_components', {
   destDir: '/bower_components'
 });
 
-var configurationFiles = pickFiles('config/package_manager_files', {
+var configurationFiles = pickFiles('config/package-manager-files', {
   srcDir: '/',
   destDir: '/',
   files: [ '**/*.json' ]

package.json

@@ -20,7 +20,7 @@
     "prepublish": "bower install && npm run-script build:production",
     "start": "ember serve",
     "test": "jscs packages && testem -R dot ci",
-    "publish-build": "npm run build:production && ./bin/publish_to_s3.js",
+    "publish-build": "npm run build:production && ./bin/publish-to-s3.js",
     "test:local": "testem -R dot ci",
     "test:beta": "testem -f config/testem-beta.json -R dot ci",
     "test:canary": "testem -f config/testem-canary.json -R dot ci",

packages/activemodel-adapter/lib/setup-container.js

@@ -1,6 +1,6 @@
-import ContainerProxy from "ember-data/system/container_proxy";
-import ActiveModelSerializer from "activemodel-adapter/system/active_model_serializer";
-import ActiveModelAdapter from "activemodel-adapter/system/active_model_adapter";
+import ContainerProxy from "ember-data/system/container-proxy";
+import ActiveModelSerializer from "activemodel-adapter/system/active-model-serializer";
+import ActiveModelAdapter from "activemodel-adapter/system/active-model-adapter";
 
 export default function setupActiveModelAdapter(container, application) {
   var proxy = new ContainerProxy(container);

packages/activemodel-adapter/lib/system.js

@@ -1,5 +1,5 @@
-import ActiveModelAdapter from "activemodel-adapter/system/active_model_adapter";
-import ActiveModelSerializer from "activemodel-adapter/system/active_model_serializer";
+import ActiveModelAdapter from "activemodel-adapter/system/active-model-adapter";
+import ActiveModelSerializer from "activemodel-adapter/system/active-model-serializer";
 
 export {
   ActiveModelAdapter,

packages/activemodel-adapter/lib/system/active_model_serializer.js → packages/activemodel-adapter/lib/system/active-model-serializer.js

@@ -1,5 +1,5 @@
 import { singularize } from "ember-inflector";
-import RESTSerializer from "ember-data/serializers/rest_serializer";
+import RESTSerializer from "ember-data/serializers/rest-serializer";
 /**
   @module ember-data
 */

packages/ember-data/lib/adapters.js

@@ -2,8 +2,8 @@
   @module ember-data
 */
 
-import FixtureAdapter from "ember-data/adapters/fixture_adapter";
-import RESTAdapter from "ember-data/adapters/rest_adapter";
+import FixtureAdapter from "ember-data/adapters/fixture-adapter";
+import RESTAdapter from "ember-data/adapters/rest-adapter";
 
 export {
   RESTAdapter,

packages/ember-data/lib/adapters/rest_adapter.js → packages/ember-data/lib/adapters/rest-adapter.js

@@ -12,7 +12,7 @@ import {
 var get = Ember.get;
 var forEach = Ember.ArrayPolyfills.forEach;
 
-import BuildURLMixin from "ember-data/adapters/build_url_mixin";
+import BuildURLMixin from "ember-data/adapters/build-url-mixin";
 
 /**
   The REST adapter allows your store to communicate with an HTTP server by

packages/ember-data/lib/initializers/data_adapter.js → packages/ember-data/lib/initializers/data-adapter.js

@@ -1,4 +1,4 @@
-import DebugAdapter from "ember-data/system/debug/debug_adapter";
+import DebugAdapter from "ember-data/system/debug/debug-adapter";
 
 /**
   Configures a container with injections on Ember applications

packages/ember-data/lib/initializers/store.js

@@ -1,6 +1,6 @@
 import {JSONSerializer, RESTSerializer} from "ember-data/serializers";
 import {RESTAdapter} from "ember-data/adapters";
-import ContainerProxy from "ember-data/system/container_proxy";
+import ContainerProxy from "ember-data/system/container-proxy";
 import Store from "ember-data/system/store";
 
 /**

packages/ember-data/lib/main.js

@@ -22,7 +22,7 @@ import {
   PromiseArray,
   PromiseObject,
   PromiseManyArray
-} from "ember-data/system/promise_proxies";
+} from "ember-data/system/promise-proxies";
 import {
   Store
 } from "ember-data/system/store";
@@ -43,18 +43,18 @@ import {
   RecordArray,
   FilteredRecordArray,
   AdapterPopulatedRecordArray
-} from "ember-data/system/record_arrays";
-import ManyArray from "ember-data/system/many_array";
-import RecordArrayManager from "ember-data/system/record_array_manager";
+} from "ember-data/system/record-arrays";
+import ManyArray from "ember-data/system/many-array";
+import RecordArrayManager from "ember-data/system/record-array-manager";
 import {
   RESTAdapter,
   FixtureAdapter
 } from "ember-data/adapters";
-import BuildURLMixin from "ember-data/adapters/build_url_mixin";
-import JSONSerializer from "ember-data/serializers/json_serializer";
-import RESTSerializer from "ember-data/serializers/rest_serializer";
+import BuildURLMixin from "ember-data/adapters/build-url-mixin";
+import JSONSerializer from "ember-data/serializers/json-serializer";
+import RESTSerializer from "ember-data/serializers/rest-serializer";
 import "ember-inflector";
-import EmbeddedRecordsMixin from "ember-data/serializers/embedded_records_mixin";
+import EmbeddedRecordsMixin from "ember-data/serializers/embedded-records-mixin";
 import {
   ActiveModelAdapter,
   ActiveModelSerializer
@@ -72,7 +72,7 @@ import {hasMany, belongsTo} from "ember-data/system/relationships";
 import "ember-data/ember-initializer";
 import setupContainer from "ember-data/setup-container";
 
-import ContainerProxy from "ember-data/system/container_proxy";
+import ContainerProxy from "ember-data/system/container-proxy";
 import Relationship from "ember-data/system/relationships/state/relationship";
 
 DS.Store         = Store;

packages/ember-data/lib/serializers.js

@@ -1,5 +1,5 @@
-import JSONSerializer from "ember-data/serializers/json_serializer";
-import RESTSerializer from "ember-data/serializers/rest_serializer";
+import JSONSerializer from "ember-data/serializers/json-serializer";
+import RESTSerializer from "ember-data/serializers/rest-serializer";
 
 export {
   JSONSerializer,

packages/ember-data/lib/serializers/rest_serializer.js → packages/ember-data/lib/serializers/rest-serializer.js

@@ -2,7 +2,7 @@
   @module ember-data
 */
 
-import JSONSerializer from "ember-data/serializers/json_serializer";
+import JSONSerializer from "ember-data/serializers/json-serializer";
 
 var forEach = Ember.ArrayPolyfills.forEach;
 var map = Ember.ArrayPolyfills.map;

packages/ember-data/lib/setup-container.js

@@ -1,7 +1,7 @@
 import initializeStore from 'ember-data/initializers/store';
 import initializeTransforms from 'ember-data/initializers/transforms';
-import initializeStoreInjections from 'ember-data/initializers/store_injections';
-import initializeDataAdapter from 'ember-data/initializers/data_adapter';
+import initializeStoreInjections from 'ember-data/initializers/store-injections';
+import initializeDataAdapter from 'ember-data/initializers/data-adapter';
 import setupActiveModelContainer from 'activemodel-adapter/setup-container';
 
 export default function setupContainer(container, application) {

packages/ember-data/lib/system/debug.js

@@ -2,7 +2,7 @@
   @module ember-data
 */
 
-import "ember-data/system/debug/debug_info";
-import DebugAdapter from "ember-data/system/debug/debug_adapter";
+import "ember-data/system/debug/debug-info";
+import DebugAdapter from "ember-data/system/debug/debug-adapter";
 
 export default DebugAdapter;

packages/ember-data/lib/system/many_array.js → packages/ember-data/lib/system/many-array.js

@@ -1,7 +1,7 @@
 /**
   @module ember-data
 */
-import { PromiseArray } from "ember-data/system/promise_proxies";
+import { PromiseArray } from "ember-data/system/promise-proxies";
 
 var get = Ember.get;
 var set = Ember.set;

packages/ember-data/lib/system/model/model.js

@@ -1,8 +1,8 @@
 import RootState from "ember-data/system/model/states";
 import Errors from "ember-data/system/model/errors";
-import { PromiseObject } from "ember-data/system/promise_proxies";
+import { PromiseObject } from "ember-data/system/promise-proxies";
 import merge from "ember-data/system/merge";
-import JSONSerializer from "ember-data/serializers/json_serializer";
+import JSONSerializer from "ember-data/serializers/json-serializer";
 import createRelationshipFor from "ember-data/system/relationships/state/create";
 import Snapshot from "ember-data/system/snapshot";
 

packages/ember-data/lib/system/record_array_manager.js → packages/ember-data/lib/system/record-array-manager.js

@@ -6,7 +6,7 @@ import {
   RecordArray,
   FilteredRecordArray,
   AdapterPopulatedRecordArray
-} from "ember-data/system/record_arrays";
+} from "ember-data/system/record-arrays";
 import {
   MapWithDefault
 } from "ember-data/system/map";

packages/ember-data/lib/system/record-arrays.js

@@ -0,0 +1,13 @@
+/**
+  @module ember-data
+*/
+
+import RecordArray from "ember-data/system/record-arrays/record-array";
+import FilteredRecordArray from "ember-data/system/record-arrays/filtered-record-array";
+import AdapterPopulatedRecordArray from "ember-data/system/record-arrays/adapter-populated-record-array";
+
+export {
+  RecordArray,
+  FilteredRecordArray,
+  AdapterPopulatedRecordArray
+};

packages/ember-data/lib/system/record_arrays/adapter_populated_record_array.js → packages/ember-data/lib/system/record-arrays/adapter-populated-record-array.js

@@ -1,4 +1,4 @@
-import RecordArray from "ember-data/system/record_arrays/record_array";
+import RecordArray from "ember-data/system/record-arrays/record-array";
 /**
   @module ember-data
 */

packages/ember-data/lib/system/record_arrays/filtered_record_array.js → packages/ember-data/lib/system/record-arrays/filtered-record-array.js

@@ -1,4 +1,4 @@
-import RecordArray from "ember-data/system/record_arrays/record_array";
+import RecordArray from "ember-data/system/record-arrays/record-array";
 
 /**
   @module ember-data

packages/ember-data/lib/system/record_arrays/record_array.js → packages/ember-data/lib/system/record-arrays/record-array.js

@@ -2,7 +2,7 @@
   @module ember-data
 */
 
-import { PromiseArray } from "ember-data/system/promise_proxies";
+import { PromiseArray } from "ember-data/system/promise-proxies";
 var get = Ember.get;
 var set = Ember.set;
 

packages/ember-data/lib/system/relationships.js

@@ -2,8 +2,8 @@
   @module ember-data
 */
 
-import belongsTo from "./relationships/belongs_to";
-import hasMany from "./relationships/has_many";
+import belongsTo from "./relationships/belongs-to";
+import hasMany from "./relationships/has-many";
 
 import "ember-data/system/relationships/ext";
 

packages/ember-data/lib/system/relationships/state/belongs_to.js → packages/ember-data/lib/system/relationships/state/belongs-to.js

@@ -1,6 +1,6 @@
 import {
   PromiseObject
-} from "ember-data/system/promise_proxies";
+} from "ember-data/system/promise-proxies";
 
 import Relationship from "ember-data/system/relationships/state/relationship";
 

packages/ember-data/lib/system/relationships/state/create.js

@@ -1,5 +1,5 @@
-import ManyRelationship from "ember-data/system/relationships/state/has_many";
-import BelongsToRelationship from "ember-data/system/relationships/state/belongs_to";
+import ManyRelationship from "ember-data/system/relationships/state/has-many";
+import BelongsToRelationship from "ember-data/system/relationships/state/belongs-to";
 
 var createRelationshipFor = function(record, relationshipMeta, store) {
   var inverseKey;

packages/ember-data/lib/system/relationships/state/has_many.js → packages/ember-data/lib/system/relationships/state/has-many.js

@@ -1,7 +1,7 @@
-import { PromiseManyArray } from "ember-data/system/promise_proxies";
+import { PromiseManyArray } from "ember-data/system/promise-proxies";
 import Relationship from "ember-data/system/relationships/state/relationship";
 import OrderedSet from "ember-data/system/ordered-set";
-import ManyArray from "ember-data/system/many_array";
+import ManyArray from "ember-data/system/many-array";
 
 var ManyRelationship = function(store, record, inverseKey, relationshipMeta) {
   this._super$constructor(store, record, inverseKey, relationshipMeta);

packages/ember-data/lib/system/store.js

@@ -17,7 +17,7 @@ import {
 import {
   promiseArray,
   promiseObject
-} from "ember-data/system/promise_proxies";
+} from "ember-data/system/promise-proxies";
 
 import {
   _bind,
@@ -39,7 +39,7 @@ import {
   _findQuery
 } from "ember-data/system/store/finders";
 
-import RecordArrayManager from "ember-data/system/record_array_manager";
+import RecordArrayManager from "ember-data/system/record-array-manager";
 
 import Model from "ember-data/system/model";
 //Stanley told me to do this

tests/index.html

@@ -5,7 +5,7 @@
     <title>Ember Data</title>
     <link rel="stylesheet" href="/bower_components/qunit/qunit/qunit.css">
     <script src="/bower_components/qunit/qunit/qunit.js"></script>
-    <script src="qunit_configuration.js"></script>
+    <script src="qunit-configuration.js"></script>
     <script src="/bower_components/handlebars/handlebars.js" ></script>
 
     <script type="text/javascript">
@@ -39,7 +39,7 @@
       }
     </script>
 
-    <script src="ember_configuration.js"></script>
+    <script src="ember-configuration.js"></script>
 
     <script type="text/javascript">
       var emberChannel = QUnit.urlParams.emberchannel || "release", emberPath;