golf 0.5.6 → 0.5.7

data/lib/golf/version.rb

@@ -1,3 +1,3 @@
 module Golf
-  VERSION = "0.5.6"
+  VERSION = "0.5.7"
 end

data/resources/jquery.golf.js

@@ -1,30 +1,28 @@
 (function($) {
 
 function toJson(obj) {
- switch (typeof obj) {
-  case 'object':
-   if (obj) {
-    var list = [];
-    if (obj instanceof Array) {
-     for (var i=0;i < obj.length;i++) {
-      list.push(toJson(obj[i]));
-     }
-     return '[' + list.join(',') + ']';
-    } else {
-     for (var prop in obj) {
-      list.push('"' + prop + '":' + toJson(obj[prop]));
-     }
-     return '{' + list.join(',') + '}';
-    }
-   } else {
-    return 'null';
-   }
-  case 'string':
-   return '"' + obj.replace(/(["'])/g, '\\$1') + '"';
-  case 'number':
-  case 'boolean':
-   return new String(obj);
- }
+  switch (typeof obj) {
+    case 'object':
+      if (obj) {
+        var list = [];
+        if (obj instanceof Array) {
+          for (var i=0;i < obj.length;i++)
+            list.push(toJson(obj[i]));
+          return '[' + list.join(',') + ']';
+        } else {
+          for (var prop in obj)
+            list.push('"' + prop + '":' + toJson(obj[prop]));
+          return '{' + list.join(',') + '}';
+        }
+      } else {
+        return 'null';
+      }
+    case 'string':
+      return '"' + obj.replace(/(["'])/g, '\\$1') + '"';
+    case 'number':
+    case 'boolean':
+      return new String(obj);
+  }
 }
 
 function Component() {
@@ -36,6 +34,9 @@ function Component() {
   this.show = function() {
     this._dom.show(Array.prototype.slice.call(arguments));
   };
+  this.toggle = function() {
+    this._dom.toggle(Array.prototype.slice.call(arguments));
+  };
 }
 
 function Debug(prefix) {
@@ -400,6 +401,25 @@ function componentConstructor(name) {
       obj.require = $fake.require;
       obj.$ = $fake;
       checkForReservedClass(obj._dom.children().find("*"));
+      
+      // find <component> elements and replace them w/components
+      obj._dom.find("component").each(function(i,v) {
+        var jself = $(v), type, ref, argv, c, i, attrs, attr;
+        for (i=0,attrs=v.attributes,argv={};i<attrs.length;i++) {
+          attr = attrs.item(i);
+          switch (attr.nodeName) {
+            case "new": type = attr.nodeValue; break;
+            case "ref": ref  = attr.nodeValue; break;
+            default: argv[attr.nodeName]=attr.nodeValue;
+          }
+        }
+        eval("c = Component."+type);
+        c = new c(argv);
+        jself.replaceWith(c);
+        if (ref)
+          obj[ref] = c;
+      });
+
       doCall(obj, $fake, $fake, argv, cmp.js, Debug(name));
       obj._dom.removeData("_golf_constructing");
       jss.mark(obj._dom.children().eq(0));
@@ -444,6 +464,13 @@ window.Component  = Component;
       };
     })($.fn.bind);
 
+    function doOnAppend(cmp) {
+      if (!cmp.didOnAppend) {
+        cmp.didOnAppend = true;
+        cmp.onAppend();
+      }
+    }
+
     $.each(
       [
         "append",
@@ -468,10 +495,14 @@ window.Component  = Component;
           $("*", e).each(function(index, elem) {
             var cmp = $(elem).data("_golf_component");
             if (cmp instanceof Component && cmp.onAppend)
-              cmp.onAppend();
+              doOnAppend(cmp);
           });
-          if (a instanceof Component && a.onAppend)
-            a.onAppend();
+          if (a instanceof Component) {
+            // run onAppend event handler if one is defined
+            if (a.onAppend)
+              doOnAppend(a);
+          }
+
           return $(this);
         }; 
       }
@@ -482,8 +513,12 @@ window.Component  = Component;
       var cmps = [];
       $("*", this).add([this]).each(function(index, elem) {
         var cmp = $(elem).data("_golf_component");
-        if (cmp)
+        // save component<->dom mapping and remove onAppend flag
+        if (cmp) {
           cmps.push({component: cmp, dom: elem});
+          // this will cause onAppend to run on next insertion into the dom
+          cmp.didOnAppend = false;
+        }
         if ($(this).attr("golfid"))
           $.golf.events[$(this).attr("golfid")] = [];
       });
@@ -616,18 +651,14 @@ $.golf = {
       return $.golf.location.hash;
   },
 
-  htmlEncode: function(text) {
-    return text.replace(/&/g,   "&amp;")
-               .replace(/</g,   "&lt;")
-               .replace(/>/g,   "&gt;")
-               .replace(/"/g,   "&quot;");
-  },
-
-  addComponent: function(cmp) {
+  createComponent: function(cmp) {
+    // create dom elements from html source
     cmp.html = $("<div/>")._golf_append(
       $(cmp.html)._golf_addClass("component")
              ._golf_addClass(cmp.name.replace(".", "-"))
     );
+
+    // strip off the wrapper div and set component dom elements
     cmp.dom = $(cmp.html.html());
 
     var m, pkg;
@@ -658,7 +689,7 @@ $.golf = {
 
     d("Loading components/ directory...");
     for (name in $.golf.components)
-      $.golf.addComponent($.golf.components[name]);
+      $.golf.createComponent($.golf.components[name]);
 
     if (!window.forcebot) {
       d("Loading styles/ directory...");

metadata

@@ -1,8 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: golf
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.5.6
+  prerelease: false
+  segments: 
+  - 0
+  - 5
+  - 7
+  version: 0.5.7
 platform: ruby
 authors: 
 - Micha Niskin, Alan Dipert, Julio Capote
@@ -10,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-14 00:00:00 -07:00
+date: 2011-04-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,6 +25,8 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -32,6 +38,8 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -43,6 +51,8 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
@@ -54,6 +64,8 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id004
@@ -216,19 +228,59 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: golf
-rubygems_version: 1.6.1
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Component based front end JS Framework
-test_files: []
-
+test_files: 
+- test/reference_app/golfapp/components.js
+- test/reference_app/golfapp/components/HelloWorld/HelloWorld.css
+- test/reference_app/golfapp/components/HelloWorld/HelloWorld.html
+- test/reference_app/golfapp/components/HelloWorld/HelloWorld.js
+- test/reference_app/golfapp/components/golf/cart/Admin/Admin.html
+- test/reference_app/golfapp/components/golf/cart/Cart/Cart.html
+- test/reference_app/golfapp/components/golf/cart/Product/Product.html
+- test/reference_app/golfapp/components/golf/cart/ProductListing/ProductListing.html
+- test/reference_app/golfapp/components/golf/cart/Store/Store.html
+- test/reference_app/golfapp/controller.js
+- test/reference_app/golfapp/img/ Timer & Non-Stick.jpeg
+- test/reference_app/golfapp/img/134lines.jpeg
+- test/reference_app/golfapp/img/Q33 Sail Plan.jpeg
+- test/reference_app/golfapp/img/a/asdf
+- test/reference_app/golfapp/img/a/b/c/zxcv
+- test/reference_app/golfapp/img/a/b/qwer
+- test/reference_app/golfapp/img/em> - Brushed Stainless Steel.jpeg
+- test/reference_app/golfapp/img/em> - White.jpeg
+- test/reference_app/golfapp/img/em> Broil CTO7100B.jpeg
+- test/reference_app/golfapp/img/em> Broiler - Stainless.jpeg
+- test/reference_app/golfapp/img/em> with Countdo.jpeg
+- test/reference_app/golfapp/img/em> with Element IQ.jpeg
+- test/reference_app/golfapp/img/em> with OneTouch ...jpeg
+- test/reference_app/golfapp/img/em> with Pizza.jpeg
+- test/reference_app/golfapp/img/em>-1.jpeg
+- test/reference_app/golfapp/img/em>-2.jpeg
+- test/reference_app/golfapp/img/em>-3.jpeg
+- test/reference_app/golfapp/img/em>-Black.jpeg
+- test/reference_app/golfapp/img/em>.jpeg
+- test/reference_app/golfapp/img/unnamed.jpeg
+- test/reference_app/golfapp/plugins/mylib.js
+- test/reference_app/golfapp/scripts/00-myscript.js
+- test/reference_app/golfapp/scripts/01-jquery.tmpl.js
+- test/reference_app/golfapp/styles/main.css
+- test/test_compiler.rb
+- test/test_helper.rb
+- test/test_rack.rb