goat 0.2.0 → 0.2.1

data/lib/goat.rb

@@ -589,7 +589,7 @@ module Goat
       id = req['_id']
       pg = active_pages[id]
       
-      # active_page_gc # we do GC here since a slight delay in opening channel is better than in loading page
+      active_page_gc # we do GC here since a slight delay in opening channel is better than in loading page
       
       if pg
         pg.mark_alive!
@@ -623,7 +623,12 @@ module Goat
       if pg
         comp = pg.components.detect{|x| x.id == compid}
         Logger.error :req, "Couldn't find component #{compid.inspect}" unless comp
-        yield comp if comp
+        
+        if comp
+          yield comp
+        else
+          respond_failed
+        end
       else
         Logger.error(:req, "Couldn't find page #{id}")
 
@@ -778,15 +783,15 @@ module Goat
       app.class.add_active_page(pg)
       resp = pg.response
       
-      app.class.active_page_gc
+      # app.class.active_page_gc
       
       action_hashes = 0
       
       ObjectSpace.each_object do |obj|
         if obj.kind_of?(Page) && obj.class != Class
-          puts "Page: #{obj.glimpse}" 
+          #puts "Page: #{obj.glimpse}" 
         elsif obj.kind_of?(Component) && obj.class != Class
-          puts "Component: #{obj.glimpse}"
+          #puts "Component: #{obj.glimpse}"
         elsif obj.kind_of?(ActionProc) && obj.class != Class
           action_hashes += 1
         end
@@ -805,7 +810,7 @@ module Goat
       @params = IndifferentHash.from_hash(request.params)
     end
     
-    def components; @canvas.components; end    
+    def components; @canvas.all_components; end
     
     def empty_response
       Rack::Response.new
@@ -855,10 +860,8 @@ module Goat
         comp_classes
       end
       
-      def script        
-        cs = all_component_classes.to_a.reject do |cls|
-          Goat.setting(:press) && Goat::Static.pressed?(cls)
-        end
+      def ordered_component_classes
+        cs = all_component_classes.to_a
         
         i = 0
         # invariant: left of i has no superclasses to right
@@ -872,6 +875,18 @@ module Goat
           end
         end
         
+        cs
+      end
+      
+      def unpressed_component_classes
+        ordered_component_classes.to_a.reject do |cls|
+          Goat.setting(:press) && Goat::Static.pressed?(cls)
+        end
+      end
+      
+      def script
+        cs = unpressed_component_classes
+                
         [
           cs.map(&:__script),
           @canvas.all_components.select{|c| c.class.wired?}.map(&:wire_script),
@@ -880,7 +895,7 @@ module Goat
       end
       
       def style
-        @canvas.all_components.map(&:class).uniq.select(&:__css).map(&:scoped_css).join
+        unpressed_component_classes.select(&:__css).map(&:scoped_css).join
       end
     end
     
@@ -1061,8 +1076,16 @@ module Goat
       App.send(:define_method, "rpc_#{name}", blk)
     end
     
+    def component_name_hierarchy(cls=self.class)
+      if cls == Component
+        []
+      else
+        component_name_hierarchy(cls.superclass) + [cls.name]
+      end
+    end
+    
     def component(body)
-      [:div, {:id => id, :class => self.class.name}, body]
+      [:div, {:id => id, :class => component_name_hierarchy.join(' ')}, body]
     end
 
     def html; make_me; end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: goat
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Patrick Collison
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-20 00:00:00 +00:00
+date: 2010-09-22 00:00:00 +00:00
 default_executable: 
 dependencies: []