Allowed non-specifying of host:port combination

jessecravens · Aug 13, 2014 · f490ea5 · f490ea5
1 parent 2e32daa
commit f490ea5
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 18 deletions.
diff --git a/dist/ember-sockets.js b/dist/ember-sockets.js
@@ -19,7 +19,7 @@
          * @type {String}
          * @default 'localhost'
          */
-        host: 'localhost',
+        host: '',
 
         /**
          * @property secure
@@ -57,14 +57,32 @@
          */
         init: function init() {
 
+            /**
+             * @property server
+             * @type {String}
+             */
+            var server = '';
+
+            (function determineHost(controller) {
+
+                var host    = $ember.get(controller, 'host'),
+                    port    = $ember.get(controller, 'port'),
+                    scheme  = $ember.get(controller, 'secure') === true ? 'https' : 'http',
+                    path    = $ember.get(controller, 'path') || '';
+
+                if (!host && !port) {
+                    return;
+                }
+
+                // Use the host to compile the connect string.
+                server = !port ? '%@://%@/%@'.fmt(scheme, host, path)
+                    : '%@://%@:%@/%@'.fmt(scheme, host, port, path);
+
+            })(this);
+
             // Create the host:port string for connecting, and then attempt to establish
             // a connection.
-            var host    = $ember.get(this, 'host'),
-                port    = $ember.get(this, 'port'),
-                scheme  = $ember.get(this, 'secure') === true ? 'https' : 'http',
-                path    = $ember.get(this, 'path') || '',
-                options = $ember.get(this, 'options') || {},
-                server  = !port ? '%@://%@/%@'.fmt(scheme, host, path) : '%@://%@:%@/%@'.fmt(scheme, host, port, path),
+            var options = $ember.get(this, 'options') || {},
                 socket  = $io(server, options);
 
             socket.on('error', this.error);
@@ -314,4 +332,4 @@
         });
     });
 
-})(window, window.Ember, window.io);
+})(window, window.Ember, window.io);
diff --git a/dist/ember-sockets.min.js b/dist/ember-sockets.min.js
diff --git a/example/js/application.js b/example/js/application.js
@@ -5,7 +5,6 @@
     $window.App = Ember.Application.create({
 
         Socket: EmberSockets.extend({
-            host: 'localhost',
             controllers: ['index']
         })
 

diff --git a/package/ember-sockets.js b/package/ember-sockets.js
@@ -19,7 +19,7 @@
          * @type {String}
          * @default 'localhost'
          */
-        host: 'localhost',
+        host: '',
 
         /**
          * @property secure
@@ -57,14 +57,32 @@
          */
         init: function init() {
 
+            /**
+             * @property server
+             * @type {String}
+             */
+            var server = '';
+
+            (function determineHost(controller) {
+
+                var host    = $ember.get(controller, 'host'),
+                    port    = $ember.get(controller, 'port'),
+                    scheme  = $ember.get(controller, 'secure') === true ? 'https' : 'http',
+                    path    = $ember.get(controller, 'path') || '';
+
+                if (!host && !port) {
+                    return;
+                }
+
+                // Use the host to compile the connect string.
+                server = !port ? '%@://%@/%@'.fmt(scheme, host, path)
+                    : '%@://%@:%@/%@'.fmt(scheme, host, port, path);
+
+            })(this);
+
             // Create the host:port string for connecting, and then attempt to establish
             // a connection.
-            var host    = $ember.get(this, 'host'),
-                port    = $ember.get(this, 'port'),
-                scheme  = $ember.get(this, 'secure') === true ? 'https' : 'http',
-                path    = $ember.get(this, 'path') || '',
-                options = $ember.get(this, 'options') || {},
-                server  = !port ? '%@://%@/%@'.fmt(scheme, host, path) : '%@://%@:%@/%@'.fmt(scheme, host, port, path),
+            var options = $ember.get(this, 'options') || {},
                 socket  = $io(server, options);
 
             socket.on('error', this.error);
@@ -314,4 +332,4 @@
         });
     });
 
-})(window, window.Ember, window.io);
+})(window, window.Ember, window.io);