prerendering working

Author: catmando

lib/active_record_base.rb

@@ -3,6 +3,7 @@ module ActiveRecord
   # 1 - Setup synchronization after commits
   # 2 - Update scope to accept different procs for server and client
   class Base
+
     class << self
 
       def _synchromesh_scope_args_check(args)
@@ -43,13 +44,6 @@ def default_scope(*args, &block)
 
       else
 
-        include React::IsomorphicHelpers
-
-        before_first_mount do
-          @_default_scope = nil
-          @_unscoped = nil
-        end
-
         alias pre_synchromesh_method_missing method_missing
 
         def method_missing(name, *args, &block)
@@ -83,7 +77,7 @@ def default_scope(*args, &block)
         end
 
         def all
-          @_default_scope ||=
+          ReactiveRecord::Base.default_scope[self] ||=
             if @_default_scopes
               root = ReactiveRecord::Collection
                      .new(self, nil, nil, self, 'all')
@@ -99,7 +93,7 @@ def all=(_collection)
         end
 
         def unscoped
-          @_unscoped ||=
+          ReactiveRecord::Base.unscoped[self] ||=
             ReactiveRecord::Collection
             .new(self, nil, nil, self, 'unscoped')
             .extend(ReactiveRecord::UnscopedCollection)

lib/reactive_record/base.rb

@@ -63,6 +63,14 @@ def self.exists?(model, id)
     class << self
       attr_reader :outer_scopes
 
+      def default_scope
+        @class_scopes[:default_scope]
+      end
+
+      def unscoped
+        @class_scopes[:unscoped]
+      end
+
       def add_to_outer_scopes(item)
         @outer_scopes << item
       end

lib/reactive_record/collection.rb

@@ -222,7 +222,7 @@ def reload_from_db(force = nil)
     end
 
     def observed
-      return if @observing
+      return if @observing || ReactiveRecord::Base.data_loading?
       begin
         @observing = true
         link_to_parent

lib/reactive_record/synchromesh_controller.rb

@@ -96,7 +96,8 @@ def subscribe
       end
 
       def read
-        data = Synchromesh::Connection.read(client_id)
+        root_path = request.original_url.gsub(/synchromesh-read.*$/, '')
+        data = Synchromesh::Connection.read(client_id, root_path)
         render json: data
       end
 
@@ -127,7 +128,7 @@ def connect_to_transport
       def console_update
         authorization = Synchromesh.authorization(params[:salt], params[:channel], params[:data][1][:broadcast_id]) #params[:data].to_json)
         return head :unauthorized if authorization != params[:authorization]
-        Synchromesh::Connection.send(params[:channel], params[:data])
+        Synchromesh::Connection.send_to_channel(params[:channel], params[:data])
         head :no_content
       rescue
         head :unauthorized

lib/synchromesh/client_drivers.rb

@@ -292,7 +292,7 @@ def self.get_queued_data(operation, channel = nil, opts = {})
             `ActionCable.createConsumer.apply(ActionCable, #{[*opts[:action_cable_consumer_url]]})`
           Synchromesh.connect(*opts[:auto_connect])
         elsif opts[:transport] == :simple_poller
-          opts[:auto_connect].each { |channel| IncomingBroadcast.add_connection *channel }
+          opts[:auto_connect].each { |channel| IncomingBroadcast.add_connection(*channel) }
           every(opts[:seconds_between_poll]) do
             get_queued_data(:read, nil, headers: {'X-SYNCHROMESH-SILENT-REQUEST': true })
           end

lib/synchromesh/connection.rb

@@ -97,7 +97,8 @@ def send_to_channel(channel, data)
         transport.send(channel, data) if exists?(channel: channel, session: nil)
       end
 
-      def read(session)
+      def read(session, root_path)
+        self.root_path = root_path
         where(session: session)
           .update_all(expires_at: Time.now + transport.expire_polled_connection_in)
         QueuedMessage.for_session(session).destroy_all.pluck(:data)

lib/synchromesh/synchromesh.rb

@@ -137,7 +137,7 @@ def self.authorization(salt, channel, session_id)
     )
   end
 
-  def self.run_after_commit(operation, model)
+  def self.after_commit(operation, model)
     InternalPolicy.regulate_broadcast(model) do |data|
       if Synchromesh.on_console? && Connection.root_path
         Synchromesh.send_to_server(data[:channel], [operation, data])
@@ -147,20 +147,5 @@ def self.run_after_commit(operation, model)
     end
   end
 
-  @queue = Queue.new
-  Thread.new do
-    loop do
-      run_after_commit(*@queue.pop)
-    end
-  end
-
-  def self.after_commit(*args)
-    if true || on_console?
-      run_after_commit(*args)
-    else
-      @queue.push args
-    end
-  end
-
   Connection.transport = self
 end

spec/synchromesh/examples/scoped_todos_spec.rb

@@ -135,7 +135,6 @@ def render
     user2.comments << FactoryGirl.create(:comment, comment: "bob made this comment", todo: user1.assigned_todos.first)
     # evaluate_ruby do
     #   Synchromesh::IncomingBroadcast.hypertrace do
-    #     #instrument :merge_current_values
     #     break_on_exit?(:merge_current_values) { Todo.find(5).comments.last.todo.nil? rescue nil }
     #   end
     #   ReactiveRecord::ScopeDescription.hypertrace do
@@ -152,17 +151,9 @@ def render
     wait_for_ajax
     page.should_not have_content('MANAGER SAYS: Me BOSS', wait: 0)
     page.should_not have_content('BOSS SAYS: Me BOSS', wait: 0)
-    #pause
-    # evaluate_ruby do
-    #   ReactiveRecord::Collection.hypertrace(instrument: :all)
-    # end
-    #pause
-    #puts "here we go!!!!!!!!!!"
     user1.update_attribute(:manager, mgr)
-    #puts evaluate_ruby "User.find(#{user1.id}).update_attribute(:manager, #{mgr.id})"
     page.should have_content('MANAGER SAYS: Me BOSS')
     page.should have_content('BOSS SAYS: Me BOSS')
     evaluate_ruby("ReactiveRecord::Base.last_fetch_at").should eq(starting_fetch_time)
-    #pause
   end
 end