magic_lamp 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ee1c1e9465b1b32277c6eb82cdbf3713c0a5f2e
-  data.tar.gz: eca8ec0a9a41a09bbdd3fc8fe68f6ff308ab48ef
+  metadata.gz: 24d10bfc30e19c36245d5a06668c291d78974e95
+  data.tar.gz: b927c195fc7bcf1cb16ea7d9779cfe00f60596c1
 SHA512:
-  metadata.gz: 6b3d8c9ec0dd46e13dded1c75c3551d9c89c699a13941d49bf1287de6c1d60109c1c9bee7230018da5c94051b6d1c72cc5894b2cc5c57cc394f1ba7a5e8ac4b9
-  data.tar.gz: 132f6d6dcf53d6feffa7c1ede7c12afab62d4a818d648e0d38be346a12080965e06ef0ab332331cb328e5e1358105e165fbd7bbc45d9d34778aa4f64f63166c0
+  metadata.gz: fa83054ff11497292adf67fd25e1b485eabc4640f4ab9603368ddb5c2724edcf679ba40da953e0f37f5d8c565a9d08cc0198afa3ab9358980c943fc2517d9a6f
+  data.tar.gz: 8dda7d8275c106a2492613fc35d55140589e95291fa3851835f42c20fa426408d7779e9055accb0929597d83f953edc481bd18f9945189a744446dcfb4a8d13f

data/README.md

@@ -1,6 +1,7 @@
 Magic Lamp
 =========
 [![Gem Version](https://badge.fury.io/rb/magic_lamp.svg)](http://badge.fury.io/rb/magic_lamp)
+[![Build Status](https://travis-ci.org/crismali/magic_lamp.svg?branch=master)](https://travis-ci.org/crismali/magic_lamp)
 
 Magic Lamp helps you get your Rails templates into your JavaScript tests. This means that way your JavaScript tests break
 if you change your templates _and_ you don't have to create so many fixtures. Plus, it lets you test your views in JavaScript.
@@ -240,7 +241,6 @@ MagicLamp.fixture(controller: OrdersController, name: "other_custom_name") do
   render :foo
 end
 ```
-If you're interested, [here's an example app](https://github.com/crismali/magic_lamp/tree/master/example).
 
 ### Drying up your fixtures
 If you have several fixtures that depend on the same setup (same controller, extensions, etc), you can use the `define` method to dry things up:
@@ -571,8 +571,10 @@ Contributing
 2. Clone it locally
 3. `cd` into the project root
 4. `ruby bootstrap`
-5. Run the specs with `appraisal rake`
-6. Create your feature branch (`git checkout -b my-new-feature`)
-7. Commit your changes (`git commit -am 'Add some feature'`)
-8. Push to the branch (`git push origin my-new-feature`)
-9. Create new Pull Request
+5. `appraisal install`
+6. Run the specs with `appraisal rake`
+7. Update the `CHANGELOG.md`
+8. Create your feature branch (`git checkout -b my-new-feature`)
+9. Commit your changes (`git commit -am 'Add some feature'`)
+10. Push to the branch (`git push origin my-new-feature`)
+11. Create new Pull Request

data/app/assets/javascripts/magic_lamp/all_fixtures.js.erb

@@ -1,11 +1,9 @@
-<% all_fixtures = MagicLamp.generate_all_fixtures.to_json rescue nil %>
-
-<% if all_fixtures %>
+<% begin %>
 
 MagicLamp.genie.cacheOnly = true;
-MagicLamp.genie.cache = <%= MagicLamp.generate_all_fixtures.to_json %>;
+MagicLamp.genie.cache = <%= MagicLamp.generate_all_fixtures.to_json %>
 
-<% else %>
+<% rescue %>
 
 throw new Error(MagicLamp.genericError);
 

data/lib/magic_lamp/version.rb

@@ -1,3 +1,3 @@
 module MagicLamp
-  VERSION = "1.6.1"
+  VERSION = "1.6.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magic_lamp
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Michael Crismali
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-29 00:00:00.000000000 Z
+date: 2015-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails