jason-rails 0.4.0 → 0.6.1

data/lib/jason/subscription_old.rb

@@ -0,0 +1,171 @@
+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

data/lib/jason/version.rb

@@ -1,3 +1,3 @@
 module Jason
-  VERSION = "0.4.0"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jason-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.1
 platform: ruby
 authors:
 - James Rees
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-22 00:00:00.000000000 Z
+date: 2021-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -66,6 +66,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  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'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  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'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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
@@ -75,6 +117,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -82,15 +125,8 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- app/assets/config/jason_engine_manifest.js
-- app/assets/images/jason/engine/.keep
-- app/assets/stylesheets/jason/engine/application.css
+- app/controllers/jason/api/pusher_controller.rb
 - app/controllers/jason/api_controller.rb
-- app/helpers/jason/engine/application_helper.rb
-- app/jobs/jason/engine/application_job.rb
-- app/mailers/jason/engine/application_mailer.rb
-- app/models/jason/engine/application_record.rb
-- app/views/layouts/jason/engine/application.html.erb
 - bin/console
 - bin/setup
 - client/babel.config.js
@@ -108,6 +144,12 @@ files:
 - client/lib/createOptDis.js
 - client/lib/createPayloadHandler.d.ts
 - client/lib/createPayloadHandler.js
+- client/lib/createServerActionQueue.d.ts
+- client/lib/createServerActionQueue.js
+- client/lib/createServerActionQueue.test.d.ts
+- client/lib/createServerActionQueue.test.js
+- client/lib/createTransportAdapter.d.ts
+- client/lib/createTransportAdapter.js
 - client/lib/deepCamelizeKeys.d.ts
 - client/lib/deepCamelizeKeys.js
 - client/lib/deepCamelizeKeys.test.d.ts
@@ -116,8 +158,20 @@ files:
 - client/lib/index.js
 - client/lib/makeEager.d.ts
 - client/lib/makeEager.js
+- client/lib/pruneIdsMiddleware.d.ts
+- client/lib/pruneIdsMiddleware.js
+- client/lib/restClient.d.ts
+- client/lib/restClient.js
+- client/lib/transportAdapters/actionCableAdapter.d.ts
+- client/lib/transportAdapters/actionCableAdapter.js
+- client/lib/transportAdapters/pusherAdapter.d.ts
+- client/lib/transportAdapters/pusherAdapter.js
 - client/lib/useAct.d.ts
 - client/lib/useAct.js
+- client/lib/useJason.d.ts
+- client/lib/useJason.js
+- client/lib/useJason.test.d.ts
+- client/lib/useJason.test.js
 - client/lib/useSub.d.ts
 - client/lib/useSub.js
 - client/package.json
@@ -128,11 +182,20 @@ files:
 - client/src/createJasonReducers.ts
 - client/src/createOptDis.ts
 - client/src/createPayloadHandler.ts
+- client/src/createServerActionQueue.test.ts
+- client/src/createServerActionQueue.ts
+- client/src/createTransportAdapter.ts
 - 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/useJason.test.ts
+- client/src/useJason.ts
 - client/src/useSub.ts
 - client/tsconfig.json
 - client/yarn.lock
@@ -140,10 +203,16 @@ files:
 - jason-rails.gemspec
 - lib/jason.rb
 - lib/jason/api_model.rb
+- lib/jason/broadcaster.rb
 - lib/jason/channel.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:
@@ -167,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Reactive user interfaces with minimal boilerplate, using Rails + Redux

data/app/assets/config/jason_engine_manifest.js

@@ -1 +0,0 @@
-//= link_directory ../stylesheets/jason/engine .css

data/app/assets/stylesheets/jason/engine/application.css

@@ -1,15 +0,0 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the bottom of the
- * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
- * files in this directory. Styles in this file should be added after the last require_* statement.
- * It is generally better to create a new file per style scope.
- *
- *= require_tree .
- *= require_self
- */

data/app/helpers/jason/engine/application_helper.rb

@@ -1,6 +0,0 @@
-module Jason
-  module Engine
-    module ApplicationHelper
-    end
-  end
-end

data/app/jobs/jason/engine/application_job.rb

@@ -1,6 +0,0 @@
-module Jason
-  module Engine
-    class ApplicationJob < ActiveJob::Base
-    end
-  end
-end

data/app/mailers/jason/engine/application_mailer.rb

@@ -1,8 +0,0 @@
-module Jason
-  module Engine
-    class ApplicationMailer < ActionMailer::Base
-      default from: 'from@example.com'
-      layout 'mailer'
-    end
-  end
-end

data/app/models/jason/engine/application_record.rb

@@ -1,7 +0,0 @@
-module Jason
-  module Engine
-    class ApplicationRecord < ActiveRecord::Base
-      self.abstract_class = true
-    end
-  end
-end

data/app/views/layouts/jason/engine/application.html.erb

@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Jason engine</title>
-  <%= csrf_meta_tags %>
-  <%= csp_meta_tag %>
-
-  <%= stylesheet_link_tag    "jason/engine/application", media: "all" %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
-</html>