Permalink
Browse files

Bumped to 1.0.4

Coffee compilation went awry apparently, 1.0.3
 was failing JSLint!
  • Loading branch information...
searls committed Jul 27, 2012
1 parent b868173 commit 08fd71ef80063f17aa91d6dd39fcb3f41ae2e811
Showing with 116 additions and 34 deletions.
  1. +3 −0 Gemfile
  2. +47 −11 Gemfile.lock
  3. +65 −22 dist/jasmine-fixture.js
  4. +1 −1 package.json
View
@@ -1,5 +1,8 @@
source :rubygems
gem 'jasmine-headless-webkit'
+gem 'guard-jasmine-headless-webkit'
+gem 'rb-fsevent'
+gem 'growl'
gem 'js_rake_tasks'
gem 'rake'
View
@@ -4,30 +4,66 @@ GEM
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.1.2)
- execjs (1.2.9)
+ coffee-script-source (1.3.3)
+ execjs (1.3.2)
multi_json (~> 1.0)
+ ffi (1.1.0)
git (1.2.5)
- jasmine-core (1.2.0.rc1)
- jasmine-headless-webkit (0.7.1)
- coffee-script (>= 2.2)
- jasmine-core (~> 1.1.beta)
+ growl (1.0.3)
+ guard (1.2.3)
+ listen (>= 0.4.2)
+ thor (>= 0.14.6)
+ guard-jasmine-headless-webkit (0.3.2)
+ guard (>= 0.4.0)
+ jasmine-headless-webkit (>= 0.7.0)
+ hike (1.2.1)
+ jasmine-core (1.2.0)
+ jasmine-headless-webkit (0.8.4)
+ coffee-script
+ jasmine-core (~> 1.1)
multi_json
rainbow
- js_rake_tasks (0.0.3)
+ sprockets (~> 2)
+ js_rake_tasks (0.1.1)
+ coffee-script-source (~> 1.3.3)
+ execjs (~> 1.3.2)
git (~> 1.2.5)
json_pure (~> 1.6.1)
semver (~> 1.0.1)
- json_pure (1.6.5)
- multi_json (1.0.3)
- rainbow (1.1.1)
- rake (0.8.7)
+ uglifier (~> 1.2.4)
+ json_pure (1.6.7)
+ listen (0.4.7)
+ rb-fchange (~> 0.0.5)
+ rb-fsevent (~> 0.9.1)
+ rb-inotify (~> 0.8.8)
+ multi_json (1.3.6)
+ rack (1.4.1)
+ rainbow (1.1.4)
+ rake (0.9.2.2)
+ rb-fchange (0.0.5)
+ ffi
+ rb-fsevent (0.9.1)
+ rb-inotify (0.8.8)
+ ffi (>= 0.5.0)
semver (1.0.1)
+ sprockets (2.4.5)
+ hike (~> 1.2)
+ multi_json (~> 1.0)
+ rack (~> 1.0)
+ tilt (~> 1.1, != 1.3.0)
+ thor (0.15.4)
+ tilt (1.3.3)
+ uglifier (1.2.6)
+ execjs (>= 0.3.0)
+ multi_json (~> 1.3)
PLATFORMS
ruby
DEPENDENCIES
+ growl
+ guard-jasmine-headless-webkit
jasmine-headless-webkit
js_rake_tasks
rake
+ rb-fsevent
View
@@ -1,10 +1,11 @@
/*
-jasmine-fixture 1.0.3
+jasmine-fixture 1.0.4
Makes injecting HTML snippets into the DOM easy & clean!
site: https://github.com/searls/jasmine-fixture
*/
+
(function() {
var createHTMLBlock;
@@ -34,7 +35,9 @@ site: https://github.com/searls/jasmine-fixture
$top = null;
_(selectorOptions.split(/[ ](?=[^\]]*?(?:\[|$))/)).inject(function($parent, elementSelector) {
var $el;
- if (elementSelector === ">") return $parent;
+ if (elementSelector === ">") {
+ return $parent;
+ }
$el = createHTMLBlock($, elementSelector).appendTo($parent);
$top || ($top = $el);
return $el;
@@ -68,7 +71,9 @@ site: https://github.com/searls/jasmine-fixture
$.jasmine = {
inject: function(arg, context) {
var $toInject, config, parent;
- if (isReady !== true) init();
+ if (isReady !== true) {
+ init();
+ }
parent = (context ? context : $("#" + rootId));
$toInject = void 0;
if (itLooksLikeHtml(arg)) {
@@ -124,7 +129,9 @@ site: https://github.com/searls/jasmine-fixture
} else if (config.text) {
return $el.text(config.text);
} else {
- if (config.html) return $el.html(config.html);
+ if (config.html) {
+ return $el.html(config.html);
+ }
}
};
itLooksLikeHtml = function(arg) {
@@ -168,7 +175,9 @@ site: https://github.com/searls/jasmine-fixture
};
}
origZenCode = ZenCode;
- if (indexes === undefined) indexes = {};
+ if (indexes === undefined) {
+ indexes = {};
+ }
if (ZenCode.charAt(0) === "!" || $.isArray(data)) {
if ($.isArray(data)) {
forScope = ZenCode;
@@ -194,7 +203,9 @@ site: https://github.com/searls/jasmine-fixture
$.map(arr, function(value, index) {
var next;
zo.main = zc;
- if (indexName !== undefined) indexes[indexName] = index;
+ if (indexName !== undefined) {
+ indexes[indexName] = index;
+ }
if (!$.isPlainObject(value)) {
value = {
value: value
@@ -231,7 +242,9 @@ site: https://github.com/searls/jasmine-fixture
} else {
blocks = ZenCode.match(regZenTagDfn);
block = blocks[0];
- if (block.length === 0) return "";
+ if (block.length === 0) {
+ return "";
+ }
if (block.indexOf("@") >= 0) {
ZenCode = parseReferences(ZenCode, ZenObject);
zo = ZenObject;
@@ -240,13 +253,17 @@ site: https://github.com/searls/jasmine-fixture
}
block = parseContents(block, data, indexes);
blockClasses = parseClasses($, block);
- if (regId.test(block)) blockId = regId.exec(block)[1];
+ if (regId.test(block)) {
+ blockId = regId.exec(block)[1];
+ }
blockAttrs = parseAttributes(block, data);
blockTag = (block.charAt(0) === "{" ? "span" : "div");
if (ZenCode.charAt(0) !== "#" && ZenCode.charAt(0) !== "." && ZenCode.charAt(0) !== "{") {
blockTag = regTag.exec(block)[1];
}
- if (block.search(regCBrace) !== -1) blockHTML = block.match(regCBrace)[1];
+ if (block.search(regCBrace) !== -1) {
+ blockHTML = block.match(regCBrace)[1];
+ }
blockAttrs = $.extend(blockAttrs, {
id: blockId,
"class": blockClasses,
@@ -293,9 +310,13 @@ site: https://github.com/searls/jasmine-fixture
};
bindData = function(ZenCode, el, data) {
var datas, i, split;
- if (ZenCode.search(regDatas) === 0) return el;
+ if (ZenCode.search(regDatas) === 0) {
+ return el;
+ }
datas = ZenCode.match(regDatas);
- if (datas === null) return el;
+ if (datas === null) {
+ return el;
+ }
i = 0;
while (i < datas.length) {
split = regData.exec(datas[i]);
@@ -310,9 +331,13 @@ site: https://github.com/searls/jasmine-fixture
};
bindEvents = function(ZenCode, el, functions) {
var bindings, fn, i, split;
- if (ZenCode.search(regEvents) === 0) return el;
+ if (ZenCode.search(regEvents) === 0) {
+ return el;
+ }
bindings = ZenCode.match(regEvents);
- if (bindings === null) return el;
+ if (bindings === null) {
+ return el;
+ }
i = 0;
while (i < bindings.length) {
split = regEvent.exec(bindings[i]);
@@ -328,7 +353,9 @@ site: https://github.com/searls/jasmine-fixture
};
parseAttributes = function(ZenBlock, data) {
var attrStrs, attrs, i, parts;
- if (ZenBlock.search(regAttrDfn) === -1) return undefined;
+ if (ZenBlock.search(regAttrDfn) === -1) {
+ return undefined;
+ }
attrStrs = ZenBlock.match(regAttrDfn);
attrs = {};
i = 0;
@@ -345,7 +372,9 @@ site: https://github.com/searls/jasmine-fixture
parseClasses = function($, ZenBlock) {
var classes, clsString, i;
ZenBlock = ZenBlock.match(regTagNotContent)[0];
- if (ZenBlock.search(regClasses) === -1) return undefined;
+ if (ZenBlock.search(regClasses) === -1) {
+ return undefined;
+ }
classes = ZenBlock.match(regClasses);
clsString = "";
i = 0;
@@ -357,14 +386,20 @@ site: https://github.com/searls/jasmine-fixture
};
parseContents = function(ZenBlock, data, indexes) {
var html;
- if (indexes === undefined) indexes = {};
+ if (indexes === undefined) {
+ indexes = {};
+ }
html = ZenBlock;
- if (data === undefined) return html;
+ if (data === undefined) {
+ return html;
+ }
while (regExclamation.test(html)) {
html = html.replace(regExclamation, function(str, str2) {
var begChar, fn, val;
begChar = "";
- if (str.indexOf("!for:") > 0 || str.indexOf("!if:") > 0) return str;
+ if (str.indexOf("!for:") > 0 || str.indexOf("!if:") > 0) {
+ return str;
+ }
if (str.charAt(0) !== "!") {
begChar = str.charAt(0);
str = str.substring(2, str.length - 1);
@@ -381,10 +416,16 @@ site: https://github.com/searls/jasmine-fixture
};
parseEnclosure = function(ZenCode, open, close, count) {
var index, ret;
- if (close === undefined) close = open;
+ if (close === undefined) {
+ close = open;
+ }
index = 1;
- if (count === undefined) count = (ZenCode.charAt(0) === open ? 1 : 0);
- if (count === 0) return;
+ if (count === undefined) {
+ count = (ZenCode.charAt(0) === open ? 1 : 0);
+ }
+ if (count === 0) {
+ return;
+ }
while (count > 0 && index < ZenCode.length) {
if (ZenCode.charAt(index) === close && ZenCode.charAt(index - 1) !== "\\") {
count--;
@@ -414,7 +455,9 @@ site: https://github.com/searls/jasmine-fixture
}
forCode = parseEnclosure(ZenCode, "!");
ZenCode = ZenCode.substr(forCode.length);
- if (ZenCode.charAt(0) === "(") return parseEnclosure(ZenCode, "(", ")");
+ if (ZenCode.charAt(0) === "(") {
+ return parseEnclosure(ZenCode, "(", ")");
+ }
tag = ZenCode.match(regZenTagDfn)[0];
ZenCode = ZenCode.substr(tag.length);
if (ZenCode.length === 0 || ZenCode.charAt(0) === "+") {
View
@@ -1,7 +1,7 @@
{
"name": "jasmine-fixture",
"description": "Manage HTML fixtures for jasmine specs",
- "version": "1.0.3",
+ "version": "1.0.4",
"keywords": [
"jasmine",
"bdd"

0 comments on commit 08fd71e

Please sign in to comment.