Skip to content

Allow components to be grouped together in a single subdirectory. #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stefanpenner merged 1 commit into from
Jul 24, 2014
Merged

Allow components to be grouped together in a single subdirectory. #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dist/ember-resolver-spade.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/ember-resolver-tests.js
View file
Open in desktop

Large diffs are not rendered by default.

19 changes: 17 additions & 2 deletions dist/ember-resolver.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,7 @@ define("ember/resolver",
}
},

podBasedModuleName: function(parsedName) {
var podPrefix = this.namespace.podModulePrefix || this.namespace.modulePrefix;
podBasedLookupWithPrefix: function(podPrefix, parsedName) {
var fullNameWithoutType = parsedName.fullNameWithoutType;

if (parsedName.type === 'template') {
Expand All @@ -179,6 +178,21 @@ define("ember/resolver",
return podPrefix + '/' + fullNameWithoutType + '/' + parsedName.type;
},

podBasedModuleName: function(parsedName) {
var podPrefix = this.namespace.podModulePrefix || this.namespace.modulePrefix;

return this.podBasedLookupWithPrefix(podPrefix, parsedName);
},

podBasedComponentsInSubdir: function(parsedName) {
var podPrefix = this.namespace.podModulePrefix || this.namespace.modulePrefix;
podPrefix = podPrefix + '/components';

if (parsedName.type === 'component' || parsedName.fullNameWithoutType.match(/^components/)) {
return this.podBasedLookupWithPrefix(podPrefix, parsedName);
}
},

mainModuleName: function(parsedName) {
// if router:main or adapter:main look for a module with just the type first
var tmpModuleName = this.prefix(parsedName) + '/' + parsedName.type;
Expand Down Expand Up @@ -214,6 +228,7 @@ define("ember/resolver",
moduleNameLookupPatterns: Ember.computed(function(){
return Ember.A([
this.podBasedModuleName,
this.podBasedComponentsInSubdir,
this.mainModuleName,
this.defaultModuleName
]);
Expand Down
2 changes: 1 addition & 1 deletion dist/ember-resolver.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 17 additions & 2 deletions dist/ember-resolver.prod.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,7 @@ define("ember/resolver",
}
},

podBasedModuleName: function(parsedName) {
var podPrefix = this.namespace.podModulePrefix || this.namespace.modulePrefix;
podBasedLookupWithPrefix: function(podPrefix, parsedName) {
var fullNameWithoutType = parsedName.fullNameWithoutType;

if (parsedName.type === 'template') {
Expand All @@ -179,6 +178,21 @@ define("ember/resolver",
return podPrefix + '/' + fullNameWithoutType + '/' + parsedName.type;
},

podBasedModuleName: function(parsedName) {
var podPrefix = this.namespace.podModulePrefix || this.namespace.modulePrefix;

return this.podBasedLookupWithPrefix(podPrefix, parsedName);
},

podBasedComponentsInSubdir: function(parsedName) {
var podPrefix = this.namespace.podModulePrefix || this.namespace.modulePrefix;
podPrefix = podPrefix + '/components';

if (parsedName.type === 'component' || parsedName.fullNameWithoutType.match(/^components/)) {
return this.podBasedLookupWithPrefix(podPrefix, parsedName);
}
},

mainModuleName: function(parsedName) {
// if router:main or adapter:main look for a module with just the type first
var tmpModuleName = this.prefix(parsedName) + '/' + parsedName.type;
Expand Down Expand Up @@ -214,6 +228,7 @@ define("ember/resolver",
moduleNameLookupPatterns: Ember.computed(function(){
return Ember.A([
this.podBasedModuleName,
this.podBasedComponentsInSubdir,
this.mainModuleName,
this.defaultModuleName
]);
Expand Down
49 changes: 49 additions & 0 deletions dist/modules/ember-resolver-tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,5 +376,54 @@ test("will lookup a components template without being rooted in `components/`",
resolver.resolve('template:components/foo-bar');
});

test("will use pods format to lookup components in components/", function() {
expect(2);

define('appkit/components/foo-bar/template', [], function(){
ok(true, 'appkit/components was used');
return 'whatever';
});

define('appkit/components/foo-bar/component', [], function(){
ok(true, 'appkit/components was used');
return 'whatever';
});

resolver.resolve('template:components/foo-bar');
resolver.resolve('component:foo-bar');
});

test("will not lookup routes in components/", function() {
expect(1);

define('appkit/components/foo-bar/route', [], function(){
ok(false, 'appkit/components was used');
return 'whatever';
});

define('appkit/routes/foo-bar', [], function(){
ok(true, 'appkit/routes was used');
return 'whatever';
});

resolver.resolve('route:foo-bar');
});

test("will not lookup non component templates in components/", function() {
expect(1);

define('appkit/components/foo-bar/template', [], function(){
ok(false, 'appkit/components was used');
return 'whatever';
});

define('appkit/templates/foo-bar', [], function(){
ok(true, 'appkit/templates was used');
return 'whatever';
});

resolver.resolve('template:foo-bar');
});

})();

19 changes: 17 additions & 2 deletions dist/modules/ember-resolver.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,7 @@ define("ember/resolver",
}
},

podBasedModuleName: function(parsedName) {
var podPrefix = this.namespace.podModulePrefix || this.namespace.modulePrefix;
podBasedLookupWithPrefix: function(podPrefix, parsedName) {
var fullNameWithoutType = parsedName.fullNameWithoutType;

if (parsedName.type === 'template') {
Expand All @@ -169,6 +168,21 @@ define("ember/resolver",
return podPrefix + '/' + fullNameWithoutType + '/' + parsedName.type;
},

podBasedModuleName: function(parsedName) {
var podPrefix = this.namespace.podModulePrefix || this.namespace.modulePrefix;

return this.podBasedLookupWithPrefix(podPrefix, parsedName);
},

podBasedComponentsInSubdir: function(parsedName) {
var podPrefix = this.namespace.podModulePrefix || this.namespace.modulePrefix;
podPrefix = podPrefix + '/components';

if (parsedName.type === 'component' || parsedName.fullNameWithoutType.match(/^components/)) {
return this.podBasedLookupWithPrefix(podPrefix, parsedName);
}
},

mainModuleName: function(parsedName) {
// if router:main or adapter:main look for a module with just the type first
var tmpModuleName = this.prefix(parsedName) + '/' + parsedName.type;
Expand Down Expand Up @@ -204,6 +218,7 @@ define("ember/resolver",
moduleNameLookupPatterns: Ember.computed(function(){
return Ember.A([
this.podBasedModuleName,
this.podBasedComponentsInSubdir,
this.mainModuleName,
this.defaultModuleName
]);
Expand Down
19 changes: 17 additions & 2 deletions packages/ember-resolver/lib/core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,7 @@ define("ember/resolver",
}
},

podBasedModuleName: function(parsedName) {
var podPrefix = this.namespace.podModulePrefix || this.namespace.modulePrefix;
podBasedLookupWithPrefix: function(podPrefix, parsedName) {
var fullNameWithoutType = parsedName.fullNameWithoutType;

if (parsedName.type === 'template') {
Expand All @@ -168,6 +167,21 @@ define("ember/resolver",
return podPrefix + '/' + fullNameWithoutType + '/' + parsedName.type;
},

podBasedModuleName: function(parsedName) {
var podPrefix = this.namespace.podModulePrefix || this.namespace.modulePrefix;

return this.podBasedLookupWithPrefix(podPrefix, parsedName);
},

podBasedComponentsInSubdir: function(parsedName) {
var podPrefix = this.namespace.podModulePrefix || this.namespace.modulePrefix;
podPrefix = podPrefix + '/components';

if (parsedName.type === 'component' || parsedName.fullNameWithoutType.match(/^components/)) {
return this.podBasedLookupWithPrefix(podPrefix, parsedName);
}
},

mainModuleName: function(parsedName) {
// if router:main or adapter:main look for a module with just the type first
var tmpModuleName = this.prefix(parsedName) + '/' + parsedName.type;
Expand Down Expand Up @@ -203,6 +217,7 @@ define("ember/resolver",
moduleNameLookupPatterns: Ember.computed(function(){
return Ember.A([
this.podBasedModuleName,
this.podBasedComponentsInSubdir,
this.mainModuleName,
this.defaultModuleName
]);
Expand Down
49 changes: 49 additions & 0 deletions packages/ember-resolver/tests/core_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,3 +313,52 @@ test("will lookup a components template without being rooted in `components/`",

resolver.resolve('template:components/foo-bar');
});

test("will use pods format to lookup components in components/", function() {
expect(2);

define('appkit/components/foo-bar/template', [], function(){
ok(true, 'appkit/components was used');
return 'whatever';
});

define('appkit/components/foo-bar/component', [], function(){
ok(true, 'appkit/components was used');
return 'whatever';
});

resolver.resolve('template:components/foo-bar');
resolver.resolve('component:foo-bar');
});

test("will not lookup routes in components/", function() {
expect(1);

define('appkit/components/foo-bar/route', [], function(){
ok(false, 'appkit/components was used');
return 'whatever';
});

define('appkit/routes/foo-bar', [], function(){
ok(true, 'appkit/routes was used');
return 'whatever';
});

resolver.resolve('route:foo-bar');
});

test("will not lookup non component templates in components/", function() {
expect(1);

define('appkit/components/foo-bar/template', [], function(){
ok(false, 'appkit/components was used');
return 'whatever';
});

define('appkit/templates/foo-bar', [], function(){
ok(true, 'appkit/templates was used');
return 'whatever';
});

resolver.resolve('template:foo-bar');
});