Rename module.toJSON to module.serialize. Add `inflatable` flag to exclude fmids where desired. Resolves #54 and resolves #55. #56

Open
wants to merge 7 commits into
from

Projects

None yet

5 participants

@georgecrawford
Contributor

No description provided.

@coveralls

Coverage Status

Coverage remained the same when pulling 2b2b81e on toJSONFixes into 446522b on master.

@rowanbeentje rowanbeentje and 1 other commented on an outdated diff Dec 20, 2013
to inflate serverside rendered
views.
+\nOptions:
@rowanbeentje
rowanbeentje Dec 20, 2013 Member

There seem to be a few of these \n gremlins in the docs... is something supposed to convert them to newlines?

@rowanbeentje rowanbeentje and 1 other commented on an outdated diff Dec 20, 2013
examples/express/build/build.css
@@ -1,8 +1 @@
-/*=========================================================================
- Module Apple
- ========================================================================== */
-.module-apple {
- padding: 14px; }
-
-.module-apple_title {
- font: 30px 'Helvetica'; }
+ERROR: Cannot load compass.
@matthew-andrews matthew-andrews commented on the diff Dec 20, 2013
build/fruitmachine.js
@@ -547,8 +547,8 @@ module.exports = function(fm) {
this._id = options.id || util.uniqueId();
this._fmid = options.fmid || util.uniqueId('fmid');
this.tag = options.tag || this.tag || 'div';
- this.classes = this.classes || options.classes || [];
- this.helpers = this.helpers || options.helpers || [];
+ this.classes = options.classes || this.classes || [];
+ this.helpers = options.helpers || this.helpers || [];
@matthew-andrews
matthew-andrews Dec 20, 2013 Member

Regression test please :trollface:

@georgecrawford
georgecrawford Dec 20, 2013 Contributor

@matthew-andrews - this change wasn't done by me, but was generated on build. So I assume someone else understands it. I have no knowledge of this part of the code.

@wilsonpage
wilsonpage Dec 20, 2013 Contributor

Probably means the build was out of date.

On Fri, Dec 20, 2013 at 11:24 AM, George Crawford
notifications@github.comwrote:

In build/fruitmachine.js:

@@ -547,8 +547,8 @@ module.exports = function(fm) {
this._id = options.id || util.uniqueId();
this._fmid = options.fmid || util.uniqueId('fmid');
this.tag = options.tag || this.tag || 'div';

  • this.classes = this.classes || options.classes || [];
  • this.helpers = this.helpers || options.helpers || [];
  • this.classes = options.classes || this.classes || [];
  • this.helpers = options.helpers || this.helpers || [];

@matthew-andrews https://github.com/matthew-andrews - this change
wasn't done by me, but was generated on build. So I assume someone else
understands it. I have no knowledge of this part of the code.


Reply to this email directly or view it on GitHubhttps://github.com/ftlabs/fruitmachine/pull/56/files#r8497414
.

@matthew-andrews
matthew-andrews Jan 10, 2014 Member

@wilsonpage Would you object to removing the built javascript from the repo and providing a link to Browserify CDN built version of fruitmachine in the readme instead?

That way we don't ever need to worry about building before committing and tagging again.

@wilsonpage
wilsonpage Jan 13, 2014 Contributor

Very cool, yes!

On Fri, Jan 10, 2014 at 12:19 AM, Matt Andrews notifications@github.comwrote:

In build/fruitmachine.js:

@@ -547,8 +547,8 @@ module.exports = function(fm) {
this._id = options.id || util.uniqueId();
this._fmid = options.fmid || util.uniqueId('fmid');
this.tag = options.tag || this.tag || 'div';

  • this.classes = this.classes || options.classes || [];
  • this.helpers = this.helpers || options.helpers || [];
  • this.classes = options.classes || this.classes || [];
  • this.helpers = options.helpers || this.helpers || [];

@wilsonpage https://github.com/wilsonpage Would you object to removing
the build javascript from the repo and providing a link to Browserify CDN
built version of fruitmachinehttp://wzrd.in/standalone/fruitmachine@latestin the readme instead?

That way we don't ever need to worry about building before committing and
tagging again.


Reply to this email directly or view it on GitHubhttps://github.com/ftlabs/fruitmachine/pull/56/files#r8776592
.

@matthew-andrews
matthew-andrews Jan 13, 2014 Member

OK. I'm on it.

@coveralls

Coverage Status

Coverage remained the same when pulling b5a55db on toJSONFixes into 446522b on master.

@coveralls

Coverage Status

Coverage remained the same when pulling adf5c1d on toJSONFixes into 446522b on master.

@matthew-andrews matthew-andrews commented on the diff Feb 21, 2014
docs/templates/readme.hogan
@@ -1,4 +1,4 @@
-# {{pkg.title}} [![Build Status](https://travis-ci.org/ftlabs/fruitmachine.png?branch=master)](https://travis-ci.org/ftlabs/fruitmachine)
+# {{pkg.title}} [![Build Status](https://travis-ci.org/ftlabs/fruitmachine.png?branch=master)](https://travis-ci.org/ftlabs/fruitmachine) [![Coverage Status](https://coveralls.io/repos/ftlabs/fruitmachine/badge.png?branch=master)](https://coveralls.io/r/ftlabs/fruitmachine?branch=master) [![Dependency Status](https://gemnasium.com/ftlabs/fruitmachine.png)](https://gemnasium.com/ftlabs/fruitmachine)
@matthew-andrews
matthew-andrews Feb 21, 2014 Member

I think coveralls is broken atm (causes travis to fail) - we should check this before adding the badge back again.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment