magic_lamp 1.3.1 → 1.4.0

data/spec/dummy/spec/magical/magic_lamp.rb

@@ -10,3 +10,11 @@ MagicLamp.register_fixture do
   @order = Order.new
   render partial: "orders/form"
 end
+
+MagicLamp.fixture(name: "hash_to_jsoned") do
+  { foo: "bar" }
+end
+
+MagicLamp.fixture(name: "just_some_string") do
+  "I'm a super awesome string"
+end

data/spec/dummy/tmp/pids/server.pid

@@ -0,0 +1 @@
+89870

data/spec/javascripts/genie_spec.js

@@ -152,6 +152,8 @@ describe('Genie', function() {
       subject.preload();
       expect(subject.cache).to.have.keys([
         'from_test_directory',
+        'hash_to_jsoned',
+        'just_some_string',
         'orders/foo',
         'orders/bar',
         'orders/form',

data/spec/javascripts/magic_lamp_spec.js

@@ -48,29 +48,25 @@ describe('MagicLamp', function() {
     });
 
     afterEach(function() {
-      _(['load', 'preload', 'clean']).each(function(method) {
+      _(['load', 'loadRaw', 'loadJSON', 'clean']).each(function(method) {
         delete window[method];
       });
     });
 
     it('puts #load on window', function() {
-      expect(window.load).to.be.a('function');
+      expect(window.load).to.equal(subject.load);
     });
 
-    it('binds #load', function() {
-      stub(subject, 'load', true);
-      load('orders/foo');
-      expect(subject.load).to.have.been.calledWith('orders/foo');
+    it('puts #clean on window', function() {
+      expect(window.clean).to.equal(subject.clean);
     });
 
-    it('puts #clean on window', function() {
-      expect(window.clean).to.be.a('function');
+    it('puts #loadRaw on window', function() {
+      expect(window.loadRaw).to.equal(subject.loadRaw);
     });
 
-    it('binds #clean', function() {
-      stub(subject, 'clean', true);
-      clean();
-      expect(subject.clean).to.have.been.calledOnce;
+    it('puts #loadJSON on window', function() {
+      expect(window.loadJSON).to.equal(subject.loadJSON);
     });
   });
 
@@ -78,18 +74,61 @@ describe('MagicLamp', function() {
     beforeEach(function() {
       subject.initialize();
       stub(subject.genie, 'load', true);
-      subject.load('foo', 'bar', 'baz');
+      var dummy =  { load: subject.load };
+      dummy.load('foo', 'bar', 'baz');
     });
 
     afterEach(function() {
       delete subject.genie;
     });
 
-    it('passes through to its genie instance', function() {
+    it('passes through to its genie instance (and is bound)', function() {
       expect(subject.genie.load).to.have.been.calledWith('foo', 'bar', 'baz');
     });
   });
 
+  describe('#loadRaw', function() {
+    var dummy;
+    var value;
+
+    beforeEach(function() {
+      subject.initialize();
+      value = 'the fixture';
+      stub(subject.genie, 'retrieveFixture', value);
+      dummy = { loadRaw: subject.loadRaw };
+    });
+
+    afterEach(function() {
+      delete subject.genie;
+    });
+
+    it('calls through to its genie\'s #retrieveFixture  (and is bound)', function() {
+      expect(dummy.loadRaw('foo')).to.equal(value);
+      expect(subject.genie.retrieveFixture).to.have.been.calledWith('foo');
+    });
+  });
+
+  describe('#loadJSON', function() {
+    var json;
+    var dummy;
+
+    beforeEach(function() {
+      json = { foo: 'bar' };
+      subject.initialize();
+      dummy = { loadJSON: subject.loadJSON };
+      stub(subject, 'loadRaw', JSON.stringify(json));
+    });
+
+    afterEach(function() {
+      delete subject.genie;
+    });
+
+    it('returns the parsed JSON from the fixture (and is bound)', function() {
+      expect(dummy.loadJSON('foo')).to.be.like(json);
+      expect(subject.loadRaw).to.have.been.calledWith('foo');
+    });
+  });
+
   describe('#preload', function() {
     beforeEach(function() {
       subject.initialize();
@@ -110,14 +149,15 @@ describe('MagicLamp', function() {
     beforeEach(function() {
       subject.initialize();
       stub(subject.genie, 'removeFixtureContainer', true);
-      subject.clean();
+      var dummy = { clean: subject.clean };
+      dummy.clean();
     });
 
     afterEach(function() {
       delete subject.genie;
     });
 
-    it('calls removeFixtureContainer on its genie instance', function() {
+    it('calls removeFixtureContainer on its genie instance (and is bound)', function() {
       expect(subject.genie.removeFixtureContainer).to.have.been.calledOnce;
     });
   });
@@ -232,5 +272,15 @@ describe('MagicLamp', function() {
       subject.load('arbitrary/orders/admin_extending', 'orders/foo');
       expect(testFixtureContainer().innerHTML).to.equal('Stevenson\nPaulson\nfoo\n');
     });
+
+    it('can load JSON', function() {
+      var json = subject.loadJSON('hash_to_jsoned');
+      expect(json).to.be.like({ foo: 'bar' });
+    });
+
+    it('can load strings', function() {
+      var string = subject.loadRaw('just_some_string');
+      expect(string).to.equal("I'm a super awesome string");
+    });
   });
 });

data/spec/lib/fixture_creator_spec.rb

@@ -10,28 +10,56 @@ describe MagicLamp::FixtureCreator do
   end
 
   describe "#generate_template" do
-    let(:rendered) do
-      subject.generate_template(OrdersController, []) do
-        render :foo
+    context "render called" do
+      let(:rendered) do
+        subject.generate_template(OrdersController, []) do
+          render :foo
+        end
       end
-    end
 
-    it "returns the template as a string" do
-      expect(rendered).to eq("foo\n")
-    end
+      it "returns the template as a string" do
+        expect(rendered).to eq("foo\n")
+      end
 
-    it "does not render the layout by default" do
-      expect(rendered).to_not match(/The layout/)
+      it "does not render the layout by default" do
+        expect(rendered).to_not match(/The layout/)
+      end
+
+      it "executes the callbacks around generation of the template" do
+        dummy = double
+        expect(subject).to receive(:execute_before_each_callback).ordered
+        expect(dummy).to receive(:render).ordered
+        expect(subject).to receive(:execute_after_each_callback).ordered
+        subject.generate_template(OrdersController, []) do
+          dummy.render
+          render :foo
+        end
+      end
     end
 
-    it "executes the callbacks around generation of the template" do
-      dummy = double
-      expect(subject).to receive(:execute_before_each_callback).ordered
-      expect(dummy).to receive(:render).ordered
-      expect(subject).to receive(:execute_after_each_callback).ordered
-      subject.generate_template(OrdersController, []) do
-        dummy.render
-        render :foo
+    context "render not called" do
+      context "render block returns a string" do
+        let(:rendered) do
+          subject.generate_template(OrdersController, []) do
+            { foo: "bar" }.to_json
+          end
+        end
+
+        it "returns the string" do
+          expect(rendered).to eq({ foo: "bar" }.to_json)
+        end
+      end
+
+      context "render block returns someting else" do
+        let(:rendered) do
+          subject.generate_template(OrdersController, []) do
+            { foo: "bar" }
+          end
+        end
+
+        it "returns the #to_json representation of the object" do
+          expect(rendered).to eq({ foo: "bar" }.to_json)
+        end
       end
     end
   end
@@ -60,10 +88,6 @@ describe MagicLamp::FixtureCreator do
         end.to_not raise_error
       end
 
-      it "has had its state set by the given block" do
-        expect(controller.params[:foo]).to eq("bar")
-      end
-
       it "has been extended with the extensions" do
         expect(controller.class.ancestors).to_not include(Foo)
         expect(controller.class.ancestors).to_not include(Bar)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magic_lamp
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Michael Crismali
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-06 00:00:00.000000000 Z
+date: 2014-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -394,6 +394,7 @@ files:
 - spec/dummy/tmp/cache/assets/test/sprockets/d771ace226fc8215a3572e0aa35bb0d6
 - spec/dummy/tmp/cache/assets/test/sprockets/e4468469b981ba614a29626880137332
 - spec/dummy/tmp/cache/assets/test/sprockets/f7cbd26ba1d28d48de824f0e94586655
+- spec/dummy/tmp/pids/server.pid
 - spec/javascripts/genie_spec.js
 - spec/javascripts/magic_lamp_spec.js
 - spec/javascripts/spec_helper.js
@@ -605,6 +606,7 @@ test_files:
 - spec/dummy/tmp/cache/assets/test/sprockets/d771ace226fc8215a3572e0aa35bb0d6
 - spec/dummy/tmp/cache/assets/test/sprockets/e4468469b981ba614a29626880137332
 - spec/dummy/tmp/cache/assets/test/sprockets/f7cbd26ba1d28d48de824f0e94586655
+- spec/dummy/tmp/pids/server.pid
 - spec/javascripts/genie_spec.js
 - spec/javascripts/magic_lamp_spec.js
 - spec/javascripts/spec_helper.js