magic_lamp 1.6.1 → 1.6.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 4ee1c1e9465b1b32277c6eb82cdbf3713c0a5f2e
4
- data.tar.gz: eca8ec0a9a41a09bbdd3fc8fe68f6ff308ab48ef
3
+ metadata.gz: 24d10bfc30e19c36245d5a06668c291d78974e95
4
+ data.tar.gz: b927c195fc7bcf1cb16ea7d9779cfe00f60596c1
5
5
  SHA512:
6
- metadata.gz: 6b3d8c9ec0dd46e13dded1c75c3551d9c89c699a13941d49bf1287de6c1d60109c1c9bee7230018da5c94051b6d1c72cc5894b2cc5c57cc394f1ba7a5e8ac4b9
7
- data.tar.gz: 132f6d6dcf53d6feffa7c1ede7c12afab62d4a818d648e0d38be346a12080965e06ef0ab332331cb328e5e1358105e165fbd7bbc45d9d34778aa4f64f63166c0
6
+ metadata.gz: fa83054ff11497292adf67fd25e1b485eabc4640f4ab9603368ddb5c2724edcf679ba40da953e0f37f5d8c565a9d08cc0198afa3ab9358980c943fc2517d9a6f
7
+ data.tar.gz: 8dda7d8275c106a2492613fc35d55140589e95291fa3851835f42c20fa426408d7779e9055accb0929597d83f953edc481bd18f9945189a744446dcfb4a8d13f
data/README.md CHANGED
@@ -1,6 +1,7 @@
1
1
  Magic Lamp
2
2
  =========
3
3
  [![Gem Version](https://badge.fury.io/rb/magic_lamp.svg)](http://badge.fury.io/rb/magic_lamp)
4
+ [![Build Status](https://travis-ci.org/crismali/magic_lamp.svg?branch=master)](https://travis-ci.org/crismali/magic_lamp)
4
5
 
5
6
  Magic Lamp helps you get your Rails templates into your JavaScript tests. This means that way your JavaScript tests break
6
7
  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
240
241
  render :foo
241
242
  end
242
243
  ```
243
- If you're interested, [here's an example app](https://github.com/crismali/magic_lamp/tree/master/example).
244
244
 
245
245
  ### Drying up your fixtures
246
246
  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
571
571
  2. Clone it locally
572
572
  3. `cd` into the project root
573
573
  4. `ruby bootstrap`
574
- 5. Run the specs with `appraisal rake`
575
- 6. Create your feature branch (`git checkout -b my-new-feature`)
576
- 7. Commit your changes (`git commit -am 'Add some feature'`)
577
- 8. Push to the branch (`git push origin my-new-feature`)
578
- 9. Create new Pull Request
574
+ 5. `appraisal install`
575
+ 6. Run the specs with `appraisal rake`
576
+ 7. Update the `CHANGELOG.md`
577
+ 8. Create your feature branch (`git checkout -b my-new-feature`)
578
+ 9. Commit your changes (`git commit -am 'Add some feature'`)
579
+ 10. Push to the branch (`git push origin my-new-feature`)
580
+ 11. Create new Pull Request
@@ -1,11 +1,9 @@
1
- <% all_fixtures = MagicLamp.generate_all_fixtures.to_json rescue nil %>
2
-
3
- <% if all_fixtures %>
1
+ <% begin %>
4
2
 
5
3
  MagicLamp.genie.cacheOnly = true;
6
- MagicLamp.genie.cache = <%= MagicLamp.generate_all_fixtures.to_json %>;
4
+ MagicLamp.genie.cache = <%= MagicLamp.generate_all_fixtures.to_json %>
7
5
 
8
- <% else %>
6
+ <% rescue %>
9
7
 
10
8
  throw new Error(MagicLamp.genericError);
11
9
 
@@ -1,3 +1,3 @@
1
1
  module MagicLamp
2
- VERSION = "1.6.1"
2
+ VERSION = "1.6.2"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: magic_lamp
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.6.1
4
+ version: 1.6.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Michael Crismali
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-06-29 00:00:00.000000000 Z
11
+ date: 2015-10-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails