jason-rails 0.6.6 → 0.7.2

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

@@ -5,6 +5,7 @@ module Jason::Publisher
   def self.cache_all
     Rails.application.eager_load!
     ActiveRecord::Base.descendants.each do |klass|
+      $redis_jason.del("jason:cache:#{klass.name.underscore}")
       klass.cache_all if klass.respond_to?(:cache_all)
     end
   end
@@ -15,7 +16,7 @@ module Jason::Publisher
 
     # Exists
     if self.persisted? && (scope.blank? || self.class.unscoped.send(scope).exists?(self.id))
-      payload = self.reload.as_json(as_json_config)
+      payload = self.as_json(as_json_config)
       gidx = Jason::LuaGenerator.new.cache_json(self.class.name.underscore, self.id, payload)
       return [payload, gidx]
     # Has been destroyed
@@ -42,7 +43,9 @@ module Jason::Publisher
     # - TODO: The value of an instance changes so that it enters/leaves a subscription
 
     # TODO: Optimize this, by caching associations rather than checking each time instance is saved
-    jason_assocs = self.class.reflect_on_all_associations(:belongs_to).select { |assoc| assoc.klass.respond_to?(:has_jason?) }
+    jason_assocs = self.class.reflect_on_all_associations(:belongs_to)
+      .reject { |assoc| assoc.polymorphic? } # Can't get the class name of a polymorphic association, by
+      .select { |assoc| assoc.klass.respond_to?(:has_jason?) }
     jason_assocs.each do |assoc|
       if previous_changes[assoc.foreign_key].present?
         Jason::Subscription.update_ids(
@@ -70,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
@@ -91,13 +119,17 @@ 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
 
   class_methods do
     def cache_all
-      all.each(&:cache_json)
+      all.find_each(&:cache_json)
     end
 
     def has_jason?
@@ -115,36 +147,8 @@ module Jason::Publisher
       self.after_initialize -> {
         @api_model = Jason::ApiModel.new(self.class.name.underscore)
       }
-      self.after_commit :publish_json_if_changed
-    end
-
-    def find_or_create_by_id(params)
-      object = find_by(id: params[:id])
-
-      if object
-        object.update(params)
-      elsif params[:hidden]
-        return false ## If an object is passed with hidden = true but didn't already exist, it's safe to never create it
-      else
-        object = create!(params)
-      end
-
-      object
-    end
-
-    def find_or_create_by_id!(params)
-      object = find_by(id: params[:id])
-
-      if object
-        object.update!(params)
-      elsif params[:hidden]
-        ## TODO: We're diverging from semantics of the Rails bang! methods here, which would normally either raise or return an object. Find a way to make this better.
-        return false ## If an object is passed with hidden = true but didn't already exist, it's safe to never create it
-      else
-        object = create!(params)
-      end
-
-      object
+      self.after_commit :force_publish_json, on: [:create, :destroy]
+      self.after_commit :publish_json_if_changed, on: [:update]
     end
   end
 

data/lib/jason/subscription.rb

@@ -48,15 +48,31 @@ class Jason::Subscription
     end
   end
 
+  def self.all_for_model(model_name)
+    $redis_jason.smembers("jason:models:#{model_name}:all:subscriptions")
+  end
+
   def self.for_instance(model_name, id, include_all = true)
     subs = $redis_jason.smembers("jason:models:#{model_name}:#{id}:subscriptions")
     if include_all
-      subs += $redis_jason.smembers("jason:models:#{model_name}:all:subscriptions")
+      subs += all_for_model(model_name)
     end
-
     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
@@ -163,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)
@@ -176,11 +196,13 @@ class Jason::Subscription
         subscription.broadcast_id_changeset(id_changeset)
       end
     end
-  end
-
-  # Add ID to any _all_ subscriptions
-  def self.add_id(model_name, id)
 
+    all_for_model(model_name).each do |sub_id|
+      subscription = find_by_id(sub_id)
+      ids.each do |id|
+        subscription.destroy(model_name, id)
+      end
+    end
   end
 
   def self.all
@@ -203,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|
@@ -238,13 +282,18 @@ class Jason::Subscription
     all_models = includes_helper.all_models(model_name)
 
     relation = model_name.classify.constantize.all.eager_load(includes_tree)
-
     if model_name == model
       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?
@@ -257,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 }
@@ -266,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
 
@@ -287,6 +336,7 @@ class Jason::Subscription
       end
       $redis_jason.del("jason:subscriptions:#{id}:ids:#{model_name}")
     end
+    $redis_jason.del("jason:subscriptions:#{id}:graph")
   end
 
   def ids(model_name = model)
@@ -328,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
@@ -344,8 +390,8 @@ class Jason::Subscription
 
   def user_can_access?(user)
     # td: implement the authorization logic here
-    return true if Jason.authorization_service.blank?
-    Jason.authorization_service.call(user, model, conditions, includes_helper.all_models - [model])
+    return true if Jason.subscription_authorization_service.blank?
+    Jason.subscription_authorization_service.call(user, model, conditions, includes_helper.all_models - [model])
   end
 
   def get
@@ -381,7 +427,6 @@ class Jason::Subscription
     # Remove subscription state
     if hard
       clear_all_ids
-      $redis_jason.del("jason:subscriptions:#{id}:graph")
     end
 
     set_ids_for_sub_models(enforce: true)

data/lib/jason/version.rb

@@ -1,3 +1,3 @@
 module Jason
-  VERSION = "0.6.6"
+  VERSION = "0.7.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jason-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.7.2
 platform: ruby
 authors:
 - James Rees
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-19 00:00:00.000000000 Z
+date: 2021-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sidekiq
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description:
 email:
 - jarees@gmail.com
@@ -126,8 +140,9 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- app/controllers/jason/api/pusher_controller.rb
-- app/controllers/jason/api_controller.rb
+- app/controllers/jason/jason_controller.rb
+- app/controllers/jason/pusher_controller.rb
+- app/workers/jason/outbound_message_queue_worker.rb
 - bin/console
 - bin/setup
 - client/babel.config.js
@@ -137,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
@@ -149,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
@@ -169,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
@@ -181,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
@@ -191,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
@@ -209,14 +231,14 @@ 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
 - lib/jason/lua_generator.rb
 - lib/jason/publisher.rb
-- lib/jason/publisher_old.rb
 - lib/jason/subscription.rb
-- lib/jason/subscription_old.rb
 - lib/jason/version.rb
 homepage: https://github.com/jamesr2323/jason
 licenses:

data/client/src/makeEager.ts

@@ -1,46 +0,0 @@
-import pluralize from 'pluralize'
-import _ from 'lodash'
-import { useSelector } from 'react-redux'
-
-export default function (schema) {
-  function addRelations(s, objects, objectType, relations) {
-    // first find out relation name
-    if (_.isArray(relations)) {
-      relations.forEach(relation => {
-        objects = addRelations(s, objects, objectType, relation)
-      })
-    } else if (typeof(relations) === 'object') {
-      const relation = Object.keys(relations)[0]
-      const subRelations = relations[relation]
-
-      objects = addRelations(s, objects, objectType, relation)
-      objects[relation] = addRelations(s, objects[relation], pluralize(relation), subRelations)
-      // #
-    } else if (typeof(relations) === 'string') {
-      const relation = relations
-      if (_.isArray(objects)) {
-        objects = objects.map(obj => addRelations(s, obj, objectType, relation))
-      } else {
-        const relatedObjects = _.values(s[pluralize(relation)].entities)
-
-        if(pluralize.isSingular(relation)) {
-          objects = { ...objects, [relation]: _.find(relatedObjects, { id: objects[relation + 'Id'] }) }
-        } else {
-          objects = { ...objects, [relation]: relatedObjects.filter(e => e[pluralize.singular(objectType) + 'Id'] === objects.id) }
-        }
-      }
-    }
-
-    return objects
-  }
-
-  function useEager(entity, id = null, relations = []) {
-    if (id) {
-      return useSelector(s => addRelations(s, { ...s[entity].entities[String(id)] }, entity, relations), _.isEqual)
-    } else {
-      return useSelector(s => addRelations(s, _.values(s[entity].entities), entity, relations), _.isEqual)
-    }
-  }
-
-  return useEager
-}