jason-rails 0.6.4 → 0.7.0

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,11 +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]
+      add: [edge_set],
+      enforce: enforce
     })
+
     apply_id_changeset(id_changeset)
   end
 
@@ -286,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)
@@ -320,17 +371,13 @@ class Jason::Subscription
     $redis_jason.hset("jason:consumers", consumer_id, Time.now.utc)
 
     if before_consumer_count == 0
-      set_ids_for_sub_models
+      set_ids_for_sub_models(enforce: true)
     end
   end
 
   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
@@ -375,6 +422,19 @@ class Jason::Subscription
     }
   end
 
+  # To be used as a fallback when some corruption of the subscription has taken place
+  def reset!(hard: false)
+    # Remove subscription state
+    if hard
+      clear_all_ids
+    end
+
+    set_ids_for_sub_models(enforce: true)
+    includes_helper.all_models.each do |model_name|
+      broadcaster.broadcast(get_for_model(model_name))
+    end
+  end
+
   def add(model_name, instance_id)
     idx = $redis_jason.incr("jason:subscription:#{id}:#{model_name}:idx")
     payload = JSON.parse($redis_jason.hget("jason:cache:#{model_name}", instance_id) || '{}')

data/lib/jason/version.rb

@@ -1,3 +1,3 @@
 module Jason
-  VERSION = "0.6.4"
+  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.4
+  version: 0.7.0
 platform: ruby
 authors:
 - James Rees
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-17 00:00:00.000000000 Z
+date: 2021-04-02 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
@@ -119,14 +133,16 @@ files:
 - ".rspec"
 - ".ruby-version"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
 - 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
@@ -136,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
@@ -148,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
@@ -168,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
@@ -180,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
@@ -190,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
@@ -208,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

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
-}