Policies not used unless there is an initializer and patch to reactrb to prevent multiple renders during data load

Author: catmando

Gemfile

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
 # Specify your gem's dependencies in synchromesh.gemspec
 gem 'hyper-trace'
+gem 'opal-browser'
 gemspec

lib/react/state_patches.rb

@@ -8,11 +8,12 @@ def has_observers?(object, name)
         !observers_by_name[object][name].empty?
       end
 
-      def set_state2(object, name, value, updates)
+      def set_state2(object, name, value, updates, exclusions = nil)
         # set object's name state to value, tell all observers it has changed.
         # Observers must implement update_react_js_state
         object_needs_notification = object.respond_to? :update_react_js_state
         observers_by_name[object][name].dup.each do |observer|
+          next if exclusions && exclusions.include?(observer)
           updates[observer] += [object, name, value]
           object_needs_notification = false if object == observer
         end
@@ -27,18 +28,32 @@ def bulk_update
         @bulk_update_flag = saved_bulk_update_flag
       end
 
+      def get_state(object, name, current_observer = @current_observer)
+        # get current value of name for object, remember that the current object depends on this state,
+        # current observer can be overriden with last param
+        if current_observer && !new_observers[current_observer][object].include?(name)
+          new_observers[current_observer][object] << name
+        end
+        if @delayed_updates && @delayed_updates[object][name]
+          @delayed_updates[object][name][1] << current_observer
+        end
+        states[object][name]
+      end
+
       def set_state(object, name, value, delay=nil)
         states[object][name] = value
         if delay || @bulk_update_flag
-          @delayed_updates ||= []
-          @delayed_updates << [object, name, value]
+          @delayed_updates ||= Hash.new { |h, k| h[k] = {} }
+          @delayed_updates[object][name] = [value, Set.new]
           @delayed_updater ||= after(0.001) do
             delayed_updates = @delayed_updates
-            @delayed_updates = []
+            @delayed_updates = Hash.new { |h, k| h[k] = {} } # could this be nil???
             @delayed_updater = nil
             updates = Hash.new { |hash, key| hash[key] = Array.new }
-            delayed_updates.each do |object, name, value|
-              set_state2(object, name, value, updates)
+            delayed_updates.each do |object, name_hash|
+              name_hash.each do |name, value_and_set|
+                set_state2(object, name, value_and_set[0], updates, value_and_set[1])
+              end
             end
             updates.each { |observer, args| observer.update_react_js_state(*args) }
           end

lib/reactive_record/collection.rb

@@ -227,7 +227,7 @@ def observed
         @observing = true
         link_to_parent
         reload_from_db(true) if @out_of_date
-        React::State.get_state(self, :collection) unless ReactiveRecord::Base.data_loading?
+        React::State.get_state(self, :collection)
       ensure
         @observing = false
       end
@@ -236,7 +236,7 @@ def observed
     alias pre_synchromesh_instance_variable_set instance_variable_set
 
     def instance_variable_set(var, val)
-      if var == :@count && !ReactiveRecord::WhileLoading.has_observers?
+      if var == :@count && !ReactiveRecord::WhileLoading.has_observers?# && !ReactiveRecord::Base.data_loading? # !ReactiveRecord::WhileLoading.has_observers?
         React::State.set_state(self, :collection, collection, true)
       end
       pre_synchromesh_instance_variable_set var, val

lib/synchromesh.rb

@@ -9,10 +9,10 @@
 #   end
 # end
 
-require_relative 'active_record_base'
 require 'set'
 if RUBY_ENGINE == 'opal'
-  #require 'reactive-record'
+  require 'reactive-record'
+  require_relative 'active_record_base'
   require_relative 'react/reset_prerender_history'
   require_relative 'synchromesh/version'
   require_relative 'json/parse_patch'
@@ -36,7 +36,8 @@
   end
   #require 'active_record/transactions'
   require 'reactive-record'
-  require 'reactive_record/permission_patches'
+  require_relative 'active_record_base'
+  #require 'reactive_record/permission_patches'
   require 'reactive_record/synchromesh_controller'
   require 'reactive_record/base_patches'
   require 'synchromesh/version'

lib/synchromesh/synchromesh.rb

@@ -6,9 +6,7 @@ module Synchromesh
   extend Configuration
 
   def self.config_reset
-    if Rails.application.config.cache_store == :null_store
-      raise 'Cannot Run Synchromesh with cache_store == :null_store'
-    end
+    require File.join(File.dirname(__FILE__), '..', 'reactive_record', 'permission_patches')
     Object.send(:remove_const, :Application) if @fake_application_defined
     policy = begin
       Object.const_get 'ApplicationPolicy'

spec/synchromesh/connection_spec.rb

@@ -47,25 +47,25 @@
     described_class.open('TestChannel', 1)
     described_class.open('AnotherChannel', 0)
     described_class.send_to_channel('TestChannel', 'data')
-    expect(described_class.read(0)).to eq(['data'])
-    expect(described_class.read(0)).to eq([])
-    expect(described_class.read(1)).to eq(['data'])
-    expect(described_class.read(1)).to eq([])
-    expect(described_class.read(0)).to eq([])
+    expect(described_class.read(0, 'path')).to eq(['data'])
+    expect(described_class.read(0, 'path')).to eq([])
+    expect(described_class.read(1, 'path')).to eq(['data'])
+    expect(described_class.read(1, 'path')).to eq([])
+    expect(described_class.read(0, 'path')).to eq([])
   end
 
   it 'will update the expiration time after reading' do
     described_class.open('TestChannel', 0)
     described_class.send_to_channel('TestChannel', 'data')
-    described_class.read(0)
+    described_class.read(0, 'path')
     Timecop.travel(Time.now+described_class.transport.expire_new_connection_in)
     expect(described_class.active).to eq(['TestChannel'])
   end
 
   it 'will expire a polled connection' do
     described_class.open('TestChannel', 0)
     described_class.send_to_channel('TestChannel', 'data')
-    described_class.read(0)
+    described_class.read(0, 'path')
     Timecop.travel(Time.now+described_class.transport.expire_polled_connection_in)
     expect(described_class.active).to eq([])
   end
@@ -94,7 +94,7 @@
 
     it "will only effect the session being connected" do
       described_class.connect_to_transport('TestChannel', 0, nil)
-      expect(described_class.read(1)).to eq(['data'])
+      expect(described_class.read(1, 'path')).to eq(['data'])
     end
 
     it "will begin refreshing the channel list" do
@@ -112,7 +112,7 @@
       described_class.open('AnotherChannel', 0)
       described_class.connect_to_transport('TestChannel', 0, nil)
       Timecop.travel(Time.now+described_class.transport.refresh_channels_every-1)
-      described_class.read(1)
+      described_class.read(1, 'path')
       described_class.connect_to_transport('AnotherChannel', 0, nil)
       expect(described_class.active).to eq(['TestChannel', 'AnotherChannel'])
       Timecop.travel(Time.now+1)
@@ -127,7 +127,7 @@
       end
       described_class.open('AnotherChannel', 0)
       Timecop.travel(Time.now+described_class.transport.refresh_channels_every)
-      described_class.read(0)
+      described_class.read(0, 'path')
       described_class.connect_to_transport('AnotherChannel', 0, nil)
       expect(described_class.active).to eq(['TestChannel', 'AnotherChannel'])
       described_class.open('TestChannel', 2)
@@ -138,7 +138,7 @@
       expect(Synchromesh).to receive(:send).with('TestChannel', 'data2')
       described_class.connect_to_transport('TestChannel', 0, nil)
       described_class.send_to_channel('TestChannel', 'data2')
-      expect(described_class.read(1)).to eq(['data', 'data2'])
+      expect(described_class.read(1, 'path')).to eq(['data', 'data2'])
     end
   end
 end

spec/synchromesh/crud_access_regulation/broadcast_controls_access_spec.rb

@@ -3,6 +3,12 @@
 
 describe "regulate access allowed" do
 
+  before(:all) do
+    Synchromesh.configuration do |config|
+      config.transport = :none
+    end
+  end
+
   context "basic tests" do
     before(:each) do
       # spec_helper resets the policy system after each test so we have to setup

spec/synchromesh/crud_access_regulation/model_policies_spec.rb

@@ -3,6 +3,12 @@
 
 describe "regulate access allowed" do
 
+  before(:all) do
+    Synchromesh.configuration do |config|
+      config.transport = :none
+    end
+  end
+
   before(:each) do
     stub_const 'DummyModel', Class.new(ActiveRecord::Base)
     DummyModel.class_eval do

spec/test_app/Gemfile

@@ -60,3 +60,4 @@ gem 'reactrb-router'
 gem 'reactive-record', '>= 0.8.0'
 gem 'synchromesh', path: '../..' #git: "https://github.com/reactrb/synchromesh.git", branch: 'authorization-policies'
 gem 'hyper-trace'
+gem 'opal-browser'

spec/test_app/Gemfile.lock

@@ -70,7 +70,7 @@ GEM
     globalid (0.3.7)
       activesupport (>= 4.1.0)
     hike (1.2.3)
-    hyper-trace (0.1.0)
+    hyper-trace (0.3.0)
     i18n (0.7.0)
     jbuilder (2.6.0)
       activesupport (>= 3.0.0, < 5.1)
@@ -233,6 +233,7 @@ DEPENDENCIES
   jquery-rails
   jquery-ui-rails
   mysql2
+  opal-browser
   opal-rails (>= 0.8.1)
   pry
   puma