From 52619a193cdaae1865d6c485d706244096b78c41 Mon Sep 17 00:00:00 2001
From: Dav Glass <davglass@gmail.com>
Date: Mon, 14 Feb 2011 21:07:17 -0600
Subject: [PATCH] Added configure support for yui-core@version passing

---
 examples/rls.js  |  2 +-
 lib/yui3-yui3.js | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/examples/rls.js b/examples/rls.js
index 3d10be4..7ee03fd 100755
--- a/examples/rls.js
+++ b/examples/rls.js
@@ -6,7 +6,7 @@ yui3.rls({
     m: 'console',
     //m: 'dd,widget,autocomplete,gallery-yql,yui2-datatable',
     //env: 'node,attribute',
-    v: '3.3.0',
+    //v: 'yui3-core@3.2.0',
     //v: '3.2.0',
     gv: '2010.09.22',
     //parse: true, //This parses the file content and returns it as the last arg
diff --git a/lib/yui3-yui3.js b/lib/yui3-yui3.js
index 3ac2f0f..98cfe6d 100644
--- a/lib/yui3-yui3.js
+++ b/lib/yui3-yui3.js
@@ -22,7 +22,7 @@ exports.configure = function(c) {
         if (!c[i]) {
             c[i] = defaultConfig[i];
         }
-        if (c[i] !== '' && (c[i].indexOf('@') !== 0)) {
+        if (c[i] !== '' && (c[i].indexOf('@') === -1)) {
             c[i] = '@' + c[i];
         }
     }
@@ -34,7 +34,7 @@ exports.configure = function(c) {
 
     var oldConfig = false;
     //This old version requires a different config parser..
-    if (c.core === '@3.2.0') {
+    if (c.core.indexOf('@3.2.0') !== -1) {
         oldConfig = true;
     }
 
@@ -47,7 +47,12 @@ exports.configure = function(c) {
 
     try {
         //Try to load the YUI3-core module
-        var yui3 = require('yui3-core' + c.core);
+        var core = 'yui3-core' + c.core;
+        if (c.core.indexOf('@') > 0) {
+            core = c.core;
+        }
+        console.log('Core: ', core);
+        var yui3 = require(core);
         var YUI = yui3.YUI;
     } catch (e) {
         throw new Error('YUI3 Core package was not found; npm install yui3-core');
@@ -56,7 +61,11 @@ exports.configure = function(c) {
 
     try {
         //Load Gallery
-        gallery = require('yui3-gallery' + c.gallery).path();
+        var gv = 'yui3-gallery' + c.gallery;
+        if (gv.indexOf('@') > 0) {
+            gv = c.gallery;
+        }
+        gallery = require(gv).path();
     } catch (e) {}
 
     try {