goat 0.3.17 → 0.3.18

data/goat.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'goat'
-  s.version = '0.3.17'
+  s.version = '0.3.18'
   s.summary = 'Pre-release beta version of Goat'
   s.author = 'Patrick Collison'
   s.email = 'patrick@collison.ie'

data/lib/goat.rb

@@ -787,6 +787,8 @@ module Goat
       StateSrvClient.register_page(@id, pg_spec)
     end
 
+    def _dom; self.dom; end
+
     def html_from_erb
       html = self.erb(@erb, :layout => false)
     end
@@ -796,7 +798,7 @@ module Goat
       helper = ExpansionHelper.new
 
       Dynamic.let(:expander => helper) do
-        exp = DOMTools.expanded_dom(self.dom)
+        exp = DOMTools.expanded_dom(self._dom)
       end
 
       distiller = DOMDistiller.new(exp, helper.components)
@@ -1101,6 +1103,7 @@ module Goat
 
   class Component
     attr_reader :id, :handlers, :page, :params, :initargs
+    attr_accessor :parent
 
     include HTMLHelpers # sure just shit it in with everything else - TODO remove?
 
@@ -1129,7 +1132,7 @@ module Goat
       c = Kernel.fetch_class(skel.cls).from_skel(skel)
       c.deserialize(skel.state)
       Profile.out(:create_component)
-      
+
       c.rerender
     end
 
@@ -1226,6 +1229,7 @@ module Goat
 
     def initialize
       @id = 'dom_' + String.random(10)
+      @parent = Dynamic[:parent] if Dynamic.variable?(:parent)
     end
 
     def live_for(spec)
@@ -1277,7 +1281,7 @@ module Goat
     def clientside_args; []; end
 
     def clientside_instance
-      args = [id, clientside_args].to_json[1..-2]
+      args = [id, @parent ? @parent.id : nil, clientside_args].to_json[1..-2]
       "(new #{self.class.name}('#{self.class.name}', #{args}))"
     end
 
@@ -1319,7 +1323,15 @@ module Goat
     end
 
     def expanded_dom
-      @expanded_dom ||= DOMTools.expanded_dom(inject_prefixes(self.dom))
+      @expanded_dom ||= DOMTools.expanded_dom(inject_prefixes(self._dom))
+    end
+
+    def _dom
+      if Dynamic.variable?(:in_a_dom) && !Dynamic.variable(:parent)
+        raise "You must set the parent of a component before inserting it into the DOM tree. Try calling #parent=."
+      end
+
+      Dynamic.let(:parent => self, :in_a_dom => true) { self.dom }
     end
 
     def dom_as_expanded

data/lib/goat/js/component.js

@@ -1,12 +1,20 @@
 var Component = Class.extend({
-  init: function(cls, id, args) {
+  init: function(cls, id, par, args) {
     this.id = id;
     this.cls = cls;
     this.loaded = false;
+    this.parentid = par;
 
     for(var k in args) {
       this[k] = args[k]
     }
+
+    if(this.initialize)
+      this.initialize(args);
+  },
+
+  parent: function() {
+    return Goat.components[this.parentid];
   },
   
   onLoad: function() {

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: goat
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 55
   prerelease: false
   segments: 
   - 0
   - 3
-  - 17
-  version: 0.3.17
+  - 18
+  version: 0.3.18
 platform: ruby
 authors: 
 - Patrick Collison
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-27 00:00:00 +00:00
+date: 2010-11-30 00:00:00 +00:00
 default_executable: 
 dependencies: []