goat 0.3.27 → 0.3.29

data/bin/state-srv

@@ -32,6 +32,8 @@ module Goat
         @channelsrvs = {}
         @page_versions = {}
         @page_updates = {}
+        @page_users = {}
+        @user_pages = {}
       end
 
       def add_component(pgid, skel)
@@ -52,8 +54,10 @@ module Goat
         @components_by_id[cid]
       end
 
-      def initialize_page(pgid)
+      def initialize_page(pgid, user)
         @page_versions[pgid] = 0
+        @page_users[pgid] = user
+        user_pages(user) << pgid if user
         @registration_times[pgid] = Time.now
       end
 
@@ -65,6 +69,14 @@ module Goat
         @page_versions[pgid]
       end
 
+      def page_user(pgid)
+        @page_users[pgid]
+      end
+
+      def user_pages(user)
+        @user_pages[user] ||= Set.new
+      end
+
       def find_page(pgid)
         @components_by_page[pgid] ||= Set.new
       end
@@ -126,6 +138,10 @@ module Goat
           Goat.logw "(No components for #{pgid})"
         end
 
+        if user = @page_users[pgid]
+          user_pages(user).delete(pgid)
+        end
+        @page_users.delete(pgid)
         @page_updates.delete(pgid)
         @last_connected.delete(pgid)
         @page_connections.delete(pgid)
@@ -180,7 +196,7 @@ module Goat
 
     class Delegate
       @registry = Registry.new
-      
+
       def self.registry; @registry; end
 
       class << self
@@ -193,7 +209,7 @@ module Goat
         end
 
         def register_page(msg)
-          ensure_keys(msg, %w{pgid components})
+          ensure_keys(msg, %w{pgid user components})
 
           pgid = msg['pgid']
 
@@ -203,7 +219,7 @@ module Goat
 
           Goat.logd("registered #{msg['components'].count} components")
 
-          @registry.initialize_page(pgid)
+          @registry.initialize_page(pgid, msg['user'])
 
           nil
         end
@@ -213,7 +229,7 @@ module Goat
 
           # return newest components first
           @registry.components_by_class(msg['class']).\
-            select{|c| c.spec == msg['spec']}.\
+            select{|c| c.live_spec == msg['spec']}.\
             select{|c| @registry.connected?(c.pgid) || \
                           @registry.last_connected_delta(c.pgid) < 120 || \
                           @registry.registration_delta(c.pgid) < 20}.\
@@ -280,7 +296,7 @@ module Goat
 
           if comp
             comp.dom = update.skel.dom
-            comp.state = update.skel.state
+            comp.live_state = update.skel.live_state
 
             @registry.incr_page_version(comp.pgid)
 
@@ -288,7 +304,7 @@ module Goat
 
             @registry.add_update(comp.pgid, txn, update)
           else
-            $stderr.puts "Couldn't find component #{id}"
+            $stderr.puts "Couldn't find component #{update.skel.id}"
           end
         end
 
@@ -343,12 +359,30 @@ module Goat
       end
 
       def run
+        Goat.logd "Garbage collecting. Live objects: #{ObjectSpace.live_objects}"
         @registry.connected_pages.each do |pgid|
           if @registry.last_connected_delta(pgid) > (60 * 60)
             Goat.logd "Deleting page #{pgid}"
             @registry.delete_page(pgid)
+          else
+            user = @registry.page_user(pgid)
+            if user
+              pgs = @registry.user_pages(user).sort_by {|pg| @registry.last_connected_delta(pg)}
+              if pgs.count > 5
+                pgs[5..-1].each do |pg|
+                  if @registry.last_connected_delta(pg) > 10 \
+                      && !@registry.connected?(pg) \
+                      && @registry.registration_delta(pg) > 10
+                    Goat.logd "Deleting page #{pg} because user #{user} has too many pages open"
+                    @registry.delete_page(pg)
+                  end
+                end
+              end
+            end
           end
         end
+
+        Goat.logd "Done. Live objects: #{ObjectSpace.live_objects}"
       end
     end
 

data/goat.gemspec

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

data/lib/goat.rb

@@ -568,7 +568,7 @@ module Goat
             if opts[:live]
               if skel = StateSrvClient.fetch_component(cid)
                 component = Kernel.fetch_class(cls).from_skel(skel)
-                component.deserialize(skel.state)
+                component.deserialize(skel.live_state)
 
                 args << component
               else
@@ -784,7 +784,7 @@ module Goat
         c.skel
       end
 
-      StateSrvClient.register_page(@id, pg_spec)
+      StateSrvClient.register_page(@id, self.user, pg_spec)
     end
 
     def _dom; self.dom; end
@@ -848,6 +848,8 @@ module Goat
     def erb=(erb); @erb = erb; #TODO make it work properly, but not support embenned components
     end
     def title=(title); @title = title; end
+
+    def user; end
   end
 
   class PageCanvas
@@ -1130,7 +1132,7 @@ module Goat
     def self.rerender(skel)
       Profile.in(:create_component)
       c = Kernel.fetch_class(skel.cls).from_skel(skel)
-      c.deserialize(skel.state)
+      c.deserialize(skel.live_state)
       Profile.out(:create_component)
 
       c.rerender
@@ -1173,12 +1175,12 @@ module Goat
 
     def skel
       ComponentSkeleton.new(
-        @pgid,
-        self.class.name,
-        @id,
-        live_spec,
-        serialize,
-        @expanded_dom
+        'pgid' => @pgid,
+        'class' => self.class.name,
+        'id' => @id,
+        'live_spec' => live_spec,
+        'live_state' => serialize,
+        'dom' => @expanded_dom
       )
     end
 
@@ -1192,7 +1194,7 @@ module Goat
       @id = skel.id
       @pgid = skel.pgid
       @old_dom = skel.dom
-      @live_spec = skel.spec
+      @live_spec = skel.live_spec
     end
 
     def rerender_partially(diff)

data/lib/goat/common.rb

@@ -11,33 +11,45 @@ module Goat
   end
 
   class ComponentSkeleton
-    attr_reader :pgid, :id, :spec
-    attr_accessor :dom, :state
+    def ensure_keys(h, spec)
+      hash = h.clone
+      spec[:required].each do |k|
+        raise "#{k} not present" unless h.include?(k)
+        hash.delete(k)
+      end
+      spec[:optional].each {|k| hash.delete(k)}
 
-    def cls; @class; end
+      raise "Unknown keys supplied: #{hash.keys.join(', ')}" unless hash.keys.empty?
+    end
 
-    def initialize(pgid, cls, id, spec, state, dom)
-      @pgid = pgid
-      @class = cls
-      @id = id
-      @state = state
-      @dom = dom
-      @spec = spec
+    def initialize(h={})
+      ensure_keys(h,
+        :required => %w{pgid class id live_spec live_state dom}, :optional => []
+      )
+      @hash = h
     end
 
+    # in which we fail at DRY:
+    def cls; @hash['class']; end
+    def pgid; @hash['pgid']; end
+    def id; @hash['id']; end
+    def live_spec; @hash['live_spec']; end
+    def live_state; @hash['live_state']; end
+    def dom; @hash['dom']; end
+
+    def dom=(d); @hash['dom'] = d; end
+    def live_state=(s); @hash['live_state'] = s; end
+
     def self.from_hash(h)
-      self.new(h['pgid'], h['class'], h['id'], h['spec'], h['state'], Marshal.load(h['dom']))
+      hash = h.clone
+      hash['dom'] = Marshal.load(h['dom'])
+      self.new(hash)
     end
 
     def to_hash
-      {
-        'pgid' => @pgid,
-        'class' => @class,
-        'id' => @id,
-        'spec' => @spec,
-        'state' => @state,
-        'dom' => Marshal.dump(@dom),
-      }
+      hash = @hash.clone
+      hash['dom'] = Marshal.dump(@hash['dom'])
+      hash
     end
   end
 

data/lib/goat/state-srv.rb

@@ -10,8 +10,8 @@ module Goat
       StateSrvConnection.send_message(type, m, sync)
     end
 
-    def self.register_page(pgid, cs)
-      send_message('register_page', 'pgid' => pgid, 'components' => cs.map(&:to_hash))
+    def self.register_page(pgid, user, cs)
+      send_message('register_page', 'pgid' => pgid, 'user' => user, 'components' => cs.map(&:to_hash))
     end
 
     def self.live_components(cls, spec)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: goat
 version: !ruby/object:Gem::Version 
-  hash: 37
+  hash: 41
   prerelease: false
   segments: 
   - 0
   - 3
-  - 27
-  version: 0.3.27
+  - 29
+  version: 0.3.29
 platform: ruby
 authors: 
 - Patrick Collison