jason-rails 0.6.8 → 0.7.0

data/lib/jason.rb

@@ -12,6 +12,8 @@ require 'jason/engine'
 require 'jason/lua_generator'
 require 'jason/includes_helper'
 require 'jason/graph_helper'
+require 'jason/conditions_matcher'
+require 'jason/consistency_checker'
 
 module Jason
   class Error < StandardError; end

data/lib/jason/api_model.rb

@@ -36,11 +36,7 @@ class Jason::ApiModel
   end
 
   def permit(params)
-    pp self
-    pp params
     params = params.require(:payload).permit(allowed_params).tap do |allowed|
-      pp "ALLOWED"
-      pp allowed
       allowed_object_params.each do |key|
         allowed[key] = params[:payload][key].to_unsafe_h if params[:payload][key]
       end

data/lib/jason/channel.rb

@@ -12,7 +12,6 @@ class Jason::Channel < ActionCable::Channel::Base
   private
 
   def handle_message(message)
-    pp message['createSubscription']
     @subscriptions ||= []
 
     begin # ActionCable swallows errors in this message - ensure they're output to logs.
@@ -38,18 +37,12 @@ class Jason::Channel < ActionCable::Channel::Base
 
     subscriptions.push(subscription)
     subscription.add_consumer(identifier)
-    subscription.get.each do |payload|
-      pp payload
-      transmit(payload) if payload.present?
-    end
   end
 
   def remove_subscription(config)
     subscription = Jason::Subscription.upsert_by_config(config['model'], conditions: config['conditions'], includes: config['includes'])
     subscriptions.reject! { |s| s.id == subscription.id }
     subscription.remove_consumer(identifier)
-
-    # TODO Stop streams
   end
 
   def get_payload(config, force_refresh = false)

data/lib/jason/conditions_matcher.rb

@@ -0,0 +1,88 @@
+class Jason::ConditionsMatcher
+  attr_reader :klass
+
+  def initialize(klass)
+    @klass = klass
+  end
+
+  # key, rules = 'post_id', 123
+  # key, rules = 'post_id', { 'value': [123,C456], 'type': 'between' }
+  # key, rules = 'post_id', { 'value': [123,456], 'type': 'between', 'not': true }
+  # key, rules = 'post_id', { 'value': 123, 'type': 'equals', 'not': true }
+  def test_match(key, rules, previous_changes)
+    return nil if !previous_changes.keys.include?(key)
+
+    if rules.is_a?(Hash)
+      matches = false
+      value = convert_to_datatype(key, rules['value'])
+
+      if rules['type'] == 'equals'
+        matches = previous_changes[key][1] == value
+      elsif rules['type'] == 'between'
+        matches = (value[0]..value[1]).cover?(previous_changes[key][1])
+      else
+        raise "Unrecognized rule type #{rules['type']}"
+      end
+
+      if rules['not']
+        return !matches
+      else
+        return matches
+      end
+
+    elsif rules.is_a?(Array)
+      value = convert_to_datatype(key, rules)
+      return previous_changes[key][1].includes?(value)
+    else
+      value = convert_to_datatype(key, rules)
+      return previous_changes[key][1] == value
+    end
+  end
+
+  # conditions = { 'post_id' => 123, 'created_at' => { 'type' => 'between', 'value' => ['2020-01-01', '2020-01-02'] } }
+  def apply_conditions(relation, conditions)
+    conditions.each do |key, rules|
+      relation = apply_condition(relation, key, rules)
+    end
+
+    relation
+  end
+
+  private
+
+  def apply_condition(relation, key, rules)
+    if rules.is_a?(Hash)
+      value = convert_to_datatype(key, rules['value'])
+
+      if rules['type'] == 'equals'
+        arg = { key => value }
+      elsif rules['type'] == 'between'
+        arg = { key => value[0]..value[1] }
+      else
+        raise "Unrecognized rule type #{rules['type']}"
+      end
+
+      if rules['not']
+        return relation.where.not(arg)
+      else
+        return relation.where(arg)
+      end
+    else
+      value = convert_to_datatype(key, rules)
+      return relation.where({ key => value })
+    end
+  end
+
+  def convert_to_datatype(key, value)
+    datatype = klass.type_for_attribute(key).type
+    if datatype == :datetime || datatype == :date
+      if value.is_a?(Array)
+        value.map { |v| v&.to_datetime }
+      else
+        value&.to_datetime
+      end
+    else
+      value
+    end
+  end
+end

data/lib/jason/consistency_checker.rb

@@ -0,0 +1,61 @@
+class Jason::ConsistencyChecker
+  attr_reader :subscription
+  attr_reader :inconsistent
+
+  def self.check_all(fix: false)
+    Jason::Subscription.all.each do |sub|
+      next if sub.consumer_count == 0
+      checker = Jason::ConsistencyChecker.new(sub)
+      result = checker.check
+      if checker.inconsistent?
+        pp sub.config
+        pp result
+        if fix
+          sub.reset!(hard: true)
+        end
+      end
+    end
+  end
+
+  def self.fix_all
+    check_all(fix: true)
+  end
+
+  def initialize(subscription)
+    @subscription = subscription
+    @inconsistent = false
+  end
+
+  def inconsistent?
+    inconsistent
+  end
+
+  # Take a subscription, get the current cached payload, and compare it to the data retrieved from the database
+  def check
+    cached_payload = subscription.get
+    edge_set = subscription.load_ids_for_sub_models(subscription.model, nil)
+
+    result = cached_payload.map do |model_name, data|
+      cached_payload_instance_ids = data[:payload].map { |row| row['id'] }
+
+      model_idx = edge_set[:model_names].index(model_name)
+      if model_idx.present?
+        edge_set_instance_ids = edge_set[:instance_ids].map { |row| row[model_idx] }
+      else
+        next
+      end
+
+      missing = edge_set_instance_ids - cached_payload_instance_ids
+      intruding = cached_payload_instance_ids - edge_set_instance_ids
+
+      if missing.present? || intruding.present?
+        @inconsistent = true
+      end
+
+      [model_name, {
+        'missing' => missing,
+        'intruding' => intruding
+      }]
+    end.compact.to_h
+  end
+end

data/lib/jason/graph_helper.rb

@@ -26,6 +26,10 @@ class Jason::GraphHelper
     $redis_jason.srem("jason:subscriptions:#{id}:graph", edges)
   end
 
+  def apply_add_node_at_root(node)
+    diff_edges_from_graph(add_edges: ["root/#{node}"])
+  end
+
   def apply_remove_node(node)
     edges = $redis_jason.smembers("jason:subscriptions:#{id}:graph")
     edges = find_edges_with_node(edges, node)

data/lib/jason/publisher.rb

@@ -73,13 +73,38 @@ module Jason::Publisher
        )
     end
 
-    # - An instance is created where it belongs_to an _all_ subscription
-    if previous_changes['id'].present?
-      Jason::Subscription.add_id(self.class.name.underscore, id)
-    end
-
     if persisted?
+      applied_sub_ids = []
+
+      jason_conditions.each do |row|
+        matches = row['conditions'].map do |key, rules|
+          Jason::ConditionsMatcher.new(self.class).test_match(key, rules, previous_changes)
+        end
+        next if matches.all? { |m| m.nil? } # None of the keys were in previous changes - therefore this condition does not apply
+        in_sub = matches.all? { |m| m }
+
+        if in_sub
+          row['subscription_ids'].each do |sub_id|
+            Jason::Subscription.find_by_id(sub_id).add_id(self.class.name.underscore, self.id)
+            applied_sub_ids.push(sub_id)
+          end
+        else
+          row['subscription_ids'].each do |sub_id|
+            jason_subscriptions.each do |already_sub_id|
+              # If this sub ID already has this instance, remove it
+              if already_sub_id == sub_id
+                sub = Jason::Subscription.find_by_id(already_sub_id)
+                sub.remove_id(self.class.name.underscore, self.id)
+                applied_sub_ids.push(already_sub_id)
+              end
+            end
+          end
+        end
+      end
+
       jason_subscriptions.each do |sub_id|
+        next if applied_sub_ids.include?(sub_id)
+
         Jason::Subscription.new(id: sub_id).update(self.class.name.underscore, id, payload, gidx)
       end
     end
@@ -94,6 +119,10 @@ module Jason::Publisher
     Jason::Subscription.for_instance(self.class.name.underscore, id)
   end
 
+  def jason_conditions
+    Jason::Subscription.conditions_for_model(self.class.name.underscore)
+  end
+
   def jason_cached_value
     JSON.parse($redis_jason.hget("jason:cache:#{self.class.name.underscore}", id) || '{}')
   end

data/lib/jason/subscription.rb

@@ -60,6 +60,19 @@ class Jason::Subscription
     subs
   end
 
+  # returns [
+  #   { condition: { post_id: 123 }, subscription_ids: [] }
+  # ]
+  def self.conditions_for_model(model_name)
+    rows = $redis_jason.smembers("jason:models:#{model_name}:conditions").map do |row|
+      JSON.parse(row)
+    end
+    conditions = rows.group_by { |row| row['conditions'] }
+    conditions.map do |conditions, rows|
+      { 'conditions' => conditions, 'subscription_ids' => rows.map { |row| row['subscription_id'] } }
+    end
+  end
+
   def self.for_model(model_name)
 
   end
@@ -166,10 +179,14 @@ class Jason::Subscription
       subscription.apply_id_changeset(id_changeset)
       subscription.broadcast_id_changeset(id_changeset)
     end
+
+    #########
+    # ---> Join the community
+    # Subs where changed is parent + parent is an _all_ or _condition_ subscription
+
   end
 
   def self.remove_ids(model_name, ids)
-    # td: finish this
     ids.each do |instance_id|
       for_instance(model_name, instance_id, false).each do |sub_id|
         subscription = find_by_id(sub_id)
@@ -188,11 +205,6 @@ class Jason::Subscription
     end
   end
 
-  # Add ID to any _all_ subscriptions
-  def self.add_id(model_name, id)
-
-  end
-
   def self.all
     $redis_jason.smembers('jason:subscriptions').map { |id| Jason::Subscription.find_by_id(id) }
   end
@@ -213,6 +225,28 @@ class Jason::Subscription
     end
   end
 
+  def remove_id(model_name, id)
+    id_changeset = graph_helper.apply_remove_node("#{model_name}:#{id}")
+    apply_id_changeset(id_changeset)
+    broadcast_id_changeset(id_changeset)
+  end
+
+  def add_id(model_name, id)
+    id_changeset = graph_helper.apply_update({
+      add: [
+        {
+          model_names: [model_name],
+          instance_ids: [[id]]
+        },
+        # Add IDs of child models
+        load_ids_for_sub_models(model_name, id)
+      ]
+    })
+
+    apply_id_changeset(id_changeset)
+    broadcast_id_changeset(id_changeset)
+  end
+
   def remove_ids(model_name, ids)
     $redis_jason.srem("jason:subscriptions:#{id}:ids:#{model_name}", ids)
     ids.each do |instance_id|
@@ -252,8 +286,14 @@ class Jason::Subscription
       if conditions.blank?
         $redis_jason.sadd("jason:models:#{model_name}:all:subscriptions", id)
         all_models -= [model_name]
-      else
+      elsif conditions.keys == ['id']
         relation = relation.where(conditions)
+      else
+        $redis_jason.sadd("jason:models:#{model_name}:conditions", {
+          'conditions' => conditions,
+          'subscription_id' => self.id
+        }.to_json)
+        relation = Jason::ConditionsMatcher.new(relation.klass).apply_conditions(relation, conditions)
       end
     else
       raise "Must supply IDs for sub models" if ids.nil?
@@ -266,7 +306,7 @@ class Jason::Subscription
 
     # pluck returns only a 1D array if only 1 arg passed
     if all_models.size == 1
-      instance_ids = [instance_ids]
+      instance_ids = instance_ids.map { |id| [id] }
     end
 
     return { model_names: all_models, instance_ids: instance_ids }
@@ -275,12 +315,12 @@ class Jason::Subscription
   # 'posts', [post#1, post#2,...]
   def set_ids_for_sub_models(model_name = model, ids = nil, enforce: false)
     edge_set = load_ids_for_sub_models(model_name, ids)
-
     # Build the tree
     id_changeset = graph_helper.apply_update({
       add: [edge_set],
       enforce: enforce
     })
+
     apply_id_changeset(id_changeset)
   end
 
@@ -338,10 +378,6 @@ class Jason::Subscription
   def remove_consumer(consumer_id)
     $redis_jason.srem("jason:subscriptions:#{id}:consumers", consumer_id)
     $redis_jason.hdel("jason:consumers", consumer_id)
-
-    if consumer_count == 0
-      clear_all_ids
-    end
   end
 
   def consumer_count

data/lib/jason/version.rb

@@ -1,3 +1,3 @@
 module Jason
-  VERSION = "0.6.8"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jason-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.7.0
 platform: ruby
 authors:
 - James Rees
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-08 00:00:00.000000000 Z
+date: 2021-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -152,6 +152,8 @@ files:
 - client/lib/JasonProvider.js
 - client/lib/actionFactory.d.ts
 - client/lib/actionFactory.js
+- client/lib/addRelations.d.ts
+- client/lib/addRelations.js
 - client/lib/createActions.d.ts
 - client/lib/createActions.js
 - client/lib/createJasonReducers.d.ts
@@ -164,6 +166,8 @@ files:
 - client/lib/createServerActionQueue.js
 - client/lib/createServerActionQueue.test.d.ts
 - client/lib/createServerActionQueue.test.js
+- client/lib/createThenable.d.ts
+- client/lib/createThenable.js
 - client/lib/createTransportAdapter.d.ts
 - client/lib/createTransportAdapter.js
 - client/lib/deepCamelizeKeys.d.ts
@@ -184,6 +188,8 @@ files:
 - client/lib/transportAdapters/pusherAdapter.js
 - client/lib/useAct.d.ts
 - client/lib/useAct.js
+- client/lib/useDraft.d.ts
+- client/lib/useDraft.js
 - client/lib/useEager.d.ts
 - client/lib/useEager.js
 - client/lib/useJason.d.ts
@@ -196,6 +202,7 @@ files:
 - client/src/JasonContext.ts
 - client/src/JasonProvider.tsx
 - client/src/actionFactory.ts
+- client/src/addRelations.ts
 - client/src/createActions.ts
 - client/src/createJasonReducers.ts
 - client/src/createOptDis.ts
@@ -206,12 +213,12 @@ files:
 - client/src/deepCamelizeKeys.test.ts
 - client/src/deepCamelizeKeys.ts
 - client/src/index.ts
-- client/src/makeEager.ts
 - client/src/pruneIdsMiddleware.ts
 - client/src/restClient.ts
 - client/src/transportAdapters/actionCableAdapter.ts
 - client/src/transportAdapters/pusherAdapter.ts
 - client/src/useAct.ts
+- client/src/useDraft.ts
 - client/src/useEager.ts
 - client/src/useJason.test.ts
 - client/src/useJason.ts
@@ -224,6 +231,8 @@ files:
 - lib/jason/api_model.rb
 - lib/jason/broadcaster.rb
 - lib/jason/channel.rb
+- lib/jason/conditions_matcher.rb
+- lib/jason/consistency_checker.rb
 - lib/jason/engine.rb
 - lib/jason/graph_helper.rb
 - lib/jason/includes_helper.rb