magic_lamp 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33f3da2cbb34f6a6ae52a955a4516f951c5d3a8b
-  data.tar.gz: b955aa9d5410e195680a5fd5962fb0d9002741c5
+  metadata.gz: 69a906c254a61fe279023604c38c637f7df43548
+  data.tar.gz: 2ca061e786370cc9e820c336a3745ad7bf2394a8
 SHA512:
-  metadata.gz: b65b5d21aa49f2f0cbf879123f256f7fee69a72a5652205d73e918000283a1e9d74918eb22ecd453b3abcbce2f8d15b00bbc953762b0cc70703bedeab8ea2a3f
-  data.tar.gz: 9fdecee1b3990996c8b30ffd555598c7cbf66900b1d4bdb08ee2314c6951d2ed25a38cdc00149601c967d2dd8b53dedfd2e044ba409c046e73abc888d230f86e
+  metadata.gz: 7cc19bac382666dddd5334cc2155a2ef794991920372dcddbb3b6917fa9fe9b352096b31a6f9e8df809e7830abc3c4a188e5949f513d0c287ab7969d94962632
+  data.tar.gz: 0b6eaefe2022618da21240a2b98966b3ff271cc03f33a222563081fe1dc2585e6774b17663dc7eb37d8bed77956b2e49f92a9c7be1c139fdc6fdb4e491caa7f9

data/README.md

@@ -119,6 +119,33 @@ Then you can go nuts testing your JavaScript against your actual template. If yo
 one request for your templates, simply call [`MagicLamp.preload();`](#preload) in your `spec_helper.js` to
 populate Magic Lamp's cache.
 
+### Loading multiple templates
+
+Just pass more fixture names to `MagicLamp.load` and it will load them all. For example:
+```js
+  beforeEach(function() {
+    MagicLamp.load("orders/sidebar", "orders/form");
+  });
+```
+
+with a sidebar template/partial that looks like this:
+```html
+  <div class="sidebar content">Links!</div>
+```
+
+and a form template/partial that looks like this:
+```html
+  <div class="form content">Inputs!</div>
+```
+
+will yield:
+```html
+  <div class="magic-lamp">
+    <div class="sidebar content">Links!</div>
+    <div class="form content">Inputs!</div>
+  </div>
+```
+
 ### A few more examples
 Here we're specifying which controller should render the template via the arguments hash
 to `fixture`. This gives us access to helper methods in the `fixture` block
@@ -367,11 +394,10 @@ Example:
   });
 ```
 ### load
-Call `MagicLamp.load` to load a fixture. It requires the name of the fixture and the fixture
-will be loaded into a `div` with a class of `magic-lamp`. It will destroy the previous fixture
-container if present so you never end up with duplicate fixture containers or end up with
-dom elements from previous loads. It will hit the network only on the first request for a given
-fixture. If you never want `load` to hit the network, call `MagicLamp.preload()` before your specs.
+Call `MagicLamp.load` to load a fixture. It requires the name of the fixture and which will be loaded into a `div` with a class of `magic-lamp`. It will destroy the previous fixture container if present so you never end up with duplicate fixture containers or end up with dom elements from previous loads. It will hit the network only on the first request for a given
+fixture. If you never want `load` to hit the network, call [`MagicLamp.preload()`](#preload) before your specs.
+
+You can load multiple fixtures into the dom at the same time by simply passing more arguments to `load`. 
 
 The call to get your template is completely synchronous.
 
@@ -380,6 +406,12 @@ Example:
   beforeEach(function() {
     MagicLamp.load("orders/foo");
   });
+
+  // or if you wanted multiple fixtures...
+
+  beforeEach(function() {
+    MagicLamp.load("orders/foo", "orders/bar", "orders/foo", "orders/baz");
+  });
 ```
 ### preload
 Call `MagicLamp.preload` to load all of your templates into MagicLamp's cache. This means you'll
@@ -460,6 +492,12 @@ MagicLamp.wishForMoreWishes => preload
 MagicLamp.polish => clean
 ```
 
+### Rake Tasks
+```
+rake mlfn => rake magic_lamp:fixture_names
+rake mll => rake magic_lamp:lint
+```
+
 Contributing
 ------------
 1. [Fork it](https://github.com/crismali/magic_lamp/fork)

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.3.0

data/app/assets/javascripts/magic_lamp/genie.js

@@ -8,10 +8,22 @@
 
   Genie.prototype = {
 
-    load: function(path) {
+    load: function() {
       this.removeFixtureContainer();
-      var fixture = this.cache[path];
       this.createFixtureContainer();
+      var fixture = '';
+      var context = this;
+
+      each(arguments, function(path) {
+        fixture += context.retrieveFixture(path);
+      });
+
+      this.fixtureContainer.innerHTML = fixture;
+      this.appendFixtureContainer();
+    },
+
+    retrieveFixture: function(path) {
+      var fixture = this.cache[path];
 
       if (!fixture && this.cacheOnly) {
         throw new Error('The fixture "' + path + '" was not preloaded. Is the fixture registered? Call `MagicLamp.fixtureNames()` to see what is registered.');
@@ -19,9 +31,7 @@
         var xhr = this.xhrRequest(getPath() + '/' + path);
         this.cache[path] = fixture = xhr.responseText;
       }
-
-      this.fixtureContainer.innerHTML = fixture;
-      this.appendFixtureContainer();
+      return fixture;
     },
 
     preload: function() {
@@ -39,9 +49,9 @@
         }
       }
       var sortedNames = names.sort();
-      for (var i = 0; i < sortedNames.length; i++) {
-        console.log(sortedNames[i]);
-      };
+      each(sortedNames, function(name) {
+        console.log(name);
+      });
 
       return sortedNames;
     },
@@ -97,6 +107,12 @@
     parentNode && parentNode.removeChild(node);
   }
 
+  function each(collection, callback) {
+    for (var i = 0; i < collection.length; i++) {
+      callback(collection[i]);
+    };
+  }
+
   function newXhr() {
     var xhr;
     if (window.XMLHttpRequest) { // Mozilla, Safari, ...