jason-rails 0.6.7 → 0.7.3

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.7"
+  VERSION = "0.7.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jason-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.7.3
 platform: ruby
 authors:
 - James Rees
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-24 00:00:00.000000000 Z
+date: 2021-04-18 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,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
-}

data/lib/jason/publisher_old.rb

@@ -1,112 +0,0 @@
-module Jason::PublisherOld
-  extend ActiveSupport::Concern
-
-  def cache_json
-    as_json_config = api_model.as_json_config
-    scope = api_model.scope
-
-    if self.persisted? && (scope.blank? || self.class.unscoped.send(scope).exists?(self.id))
-      payload = self.reload.as_json(as_json_config)
-      $redis_jason.hset("jason:#{self.class.name.underscore}:cache", self.id, payload.to_json)
-    else
-      $redis_jason.hdel("jason:#{self.class.name.underscore}:cache", self.id)
-    end
-  end
-
-  def publish_json
-    cache_json
-    return if skip_publish_json
-
-    self.class.jason_subscriptions.each do |id, config_json|
-      config = JSON.parse(config_json)
-
-      if (config['conditions'] || {}).all? { |field, value| self.send(field) == value }
-        Jason::Subscription.new(id: id).update(self.class.name.underscore)
-      end
-    end
-  end
-
-  def publish_json_if_changed
-    subscribed_fields = api_model.subscribed_fields
-    publish_json if (self.previous_changes.keys.map(&:to_sym) & subscribed_fields).present? || !self.persisted?
-  end
-
-  class_methods do
-    def subscriptions
-      $redis_jason.hgetall("jason:#{self.name.underscore}:subscriptions")
-    end
-
-    def jason_subscriptions
-      $redis_jason.hgetall("jason:#{self.name.underscore}:subscriptions")
-    end
-
-    def publish_all(instances)
-      instances.each(&:cache_json)
-
-      subscriptions.each do |id, config_json|
-        Jason::Subscription.new(id: id).update(self.name.underscore)
-      end
-    end
-
-    def flush_cache
-      $redis_jason.del("jason:#{self.name.underscore}:cache")
-    end
-
-    def setup_json
-      self.after_initialize -> {
-        @api_model = Jason::ApiModel.new(self.class.name.underscore)
-      }
-      self.after_commit :publish_json_if_changed
-
-      include_models = Jason::ApiModel.new(self.name.underscore).include_models
-
-      include_models.map do |assoc|
-        puts assoc
-        reflection = self.reflect_on_association(assoc.to_sym)
-        reflection.klass.after_commit -> {
-          subscribed_fields = Jason::ApiModel.new(self.class.name.underscore).subscribed_fields
-          puts subscribed_fields.inspect
-
-          if (self.previous_changes.keys.map(&:to_sym) & subscribed_fields).present?
-            self.send(reflection.inverse_of.name)&.publish_json
-          end
-        }
-      end
-    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
-    end
-  end
-
-  included do
-    attr_accessor :skip_publish_json, :api_model
-
-    setup_json
-  end
-end

data/lib/jason/subscription_old.rb

@@ -1,171 +0,0 @@
-class Jason::SubscriptionOld
-  attr_accessor :id, :config
-
-  def initialize(id: nil, config: nil)
-    if id
-      @id = id
-      raw_config = $redis_jason.hgetall("jason:subscriptions:#{id}").map { |k,v| [k, JSON.parse(v)] }.to_h
-      set_config(raw_config)
-    else
-      @id = Digest::MD5.hexdigest(config.to_json)
-      configure(config)
-    end
-  end
-
-  def set_config(raw_config)
-    @config =  raw_config.with_indifferent_access.map { |k,v| [k.underscore.to_s, v] }.to_h
-  end
-
-  def configure(raw_config)
-    set_config(raw_config)
-    $redis_jason.hmset("jason:subscriptions:#{id}", *config.map { |k,v| [k, v.to_json]}.flatten)
-  end
-
-  def destroy
-    config.each do |model, value|
-      $redis_jason.srem("jason:#{model.to_s.underscore}:subscriptions", id)
-    end
-    $redis_jason.del("jason:subscriptions:#{id}")
-  end
-
-  def add_consumer(consumer_id)
-    before_consumer_count = consumer_count
-    $redis_jason.sadd("jason:subscriptions:#{id}:consumers", consumer_id)
-    $redis_jason.hset("jason:consumers", consumer_id, Time.now.utc)
-
-    add_subscriptions
-    publish_all
-  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
-      remove_subscriptions
-    end
-  end
-
-  def consumer_count
-    $redis_jason.scard("jason:subscriptions:#{id}:consumers")
-  end
-
-  def channel
-    "jason:#{id}"
-  end
-
-  def publish_all
-    config.each do |model, model_config|
-      klass = model.to_s.classify.constantize
-      conditions = model_config['conditions'] || {}
-      klass.where(conditions).find_each(&:cache_json)
-      update(model)
-    end
-  end
-
-  def add_subscriptions
-    config.each do |model, value|
-      $redis_jason.hset("jason:#{model.to_s.underscore}:subscriptions", id, value.to_json)
-      update(model)
-    end
-  end
-
-  def remove_subscriptions
-    config.each do |model, _|
-      $redis_jason.hdel("jason:#{model.to_s.underscore}:subscriptions", id)
-    end
-  end
-
-  def self.publish_all
-    JASON_API_MODEL.each do |model, _v|
-      klass = model.to_s.classify.constantize
-      klass.publish_all(klass.all) if klass.respond_to?(:publish_all)
-    end
-  end
-
-  def get(model_name)
-    LuaGenerator.new.index_hash_by_set("jason:cache:#{model_name}", "")
-
-    value = JSON.parse($redis_jason.get("#{channel}:#{model}:value") || '[]')
-    idx = $redis_jason.get("#{channel}:#{model}:idx").to_i
-
-    {
-      type: 'payload',
-      md5Hash: id,
-      model: model,
-      value: value,
-      idx: idx
-    }
-  end
-
-  def get_diff(old_value, value)
-    JsonDiff.generate(old_value, value)
-  end
-
-  def deep_stringify(value)
-    if value.is_a?(Hash)
-      value.deep_stringify_keys
-    elsif value.is_a?(Array)
-      value.map { |x| x.deep_stringify_keys }
-    end
-  end
-
-  def get_throttle
-    if !$throttle_rate || !$throttle_timeout || Time.now.utc > $throttle_timeout
-      $throttle_timeout = Time.now.utc + 5.seconds
-      $throttle_rate = ($redis_jason.get('global_throttle_rate') || 0).to_i
-    else
-      $throttle_rate
-    end
-  end
-
-  # Atomically update and return patch
-  def update(model)
-    start_time = Time.now.utc
-    conditions = config[model]['conditions']
-
-    value = $redis_jason.hgetall("jason:#{model}:cache")
-      .values.map { |v| JSON.parse(v) }
-      .select { |v| (conditions || {}).all? { |field, value| v[field] == value } }
-      .sort_by { |v| v['id'] }
-
-    # lfsa = last finished, started at
-    # If another job that started after this one, finished before this one, skip sending this state update
-    if Time.parse($redis_jason.get("jason:#{channel}:lfsa") || '1970-01-01 00:00:00 UTC') < start_time
-      $redis_jason.set("jason:#{channel}:lfsa", start_time)
-    else
-      return
-    end
-
-    value = deep_stringify(value)
-
-    # If value has changed, return old value and new idx. Otherwise do nothing.
-    cmd = <<~LUA
-      local old_val=redis.call('get', ARGV[1] .. ':value')
-      if old_val ~= ARGV[2] then
-        redis.call('set', ARGV[1] .. ':value', ARGV[2])
-        local new_idx = redis.call('incr', ARGV[1] .. ':idx')
-        return { new_idx, old_val }
-      end
-    LUA
-
-    result = $redis_jason.eval cmd, [], ["#{channel}:#{model}", value.to_json]
-    return if result.blank?
-
-    idx = result[0]
-    old_value = JSON.parse(result[1] || '[]')
-    diff = get_diff(old_value, value)
-
-    end_time = Time.now.utc
-
-    payload = {
-      model: model,
-      md5Hash: id,
-      diff: diff,
-      idx: idx.to_i,
-      latency: ((end_time - start_time)*1000).round
-    }
-
-    ActionCable.server.broadcast("jason:#{id}", payload)
-  end
-end