jason-rails 0.7.5 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b901c6b15b2b4f00d307c0e86811d660a68be05ac8c43f3d48c41412a020b4e8
-  data.tar.gz: 3fbed93cb66f5acffe86a8254f0be3ed67979bf93d72ab8faed77a0ae552fff3
+  metadata.gz: 592a7eab8028ae28815abbf0d401d98b2ceabc0009f30713f68795da21adb165
+  data.tar.gz: 315f5088e258dcab9755dc92f4de03f3f2f016cf6698d3619f022c1e7d601e9d
 SHA512:
-  metadata.gz: 6959b8b6e2b97547a9c596d4efe5332339deb240c31c3951eb10e017e54932e529c851303e38bdc347c8ed89b4a209974fe790f3377128b0fb4229d14c490f66
-  data.tar.gz: a9a17d52153d5580efcd2940437b1f5eac249f7611d38a152a4a043ea35803f1de6d2ce9e53ecd0e8dee923efd47df1be3c1b1d73e515095a4356875e25f0438
+  metadata.gz: a33fdc1d57462a97b7dd571222ff314cc77338e5172fcfc662f3e1fd5f008deed299abcd870900d0b50805944af822b462f6adee46953895499ce49f69df6680
+  data.tar.gz: 8ec1a59761856754f09bb7b6431d3d45d319daf9d4c7f030b8c7c2301c28ab2d0393952c4d7339a4d6310da2689c3cba8c71048deed931e0d3c4b0cf5c2fc2f1

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## v0.8.0
+- Cold cache handling:
+ - Expiry is now set on all cached models of one week
+ - Code now handles case where cached model is missing and repopulates the cache
+
+## v0.7.5
+- Fixed JS errors when payloads arrive on websockets after the subscription has been unmounted
+- Fixed errors during initialization due to calling `cache_all` on a Rails model before it had fully initialized.
+
 ## v0.7.3
 - Added: Add JasonContext to exports, for use in scenarios where you need to forward the context into some other React reconciler (e.g. `react-three-fiber`)
 - Fixed: Unneeded `reload` in Publisher resulting in extra database calls

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jason-rails (0.7.1)
+    jason-rails (0.7.5)
       connection_pool (>= 2.2.3)
       jsondiff
       rails (>= 5)

data/README.md

@@ -21,7 +21,7 @@ An alternative way of thinking about Jason is "what if we applied the Flux/Redux
 Add the gem and the NPM package
 
 ```ruby
-gem 'jason-rails'
+gem 'jason-rails', require: 'jason'
 ```
 
 ```bash
@@ -180,6 +180,7 @@ Development is primarily driven by the needs of projects we're using Jason in. I
 
 ## Publishing a new version
 - Update `version.rb`
+- Update CHANGELOG
 - `gem build`
 - `gem push`
 - `npm version [major/minor/patch]`

data/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jamesr2323/jason",
-  "version": "0.7.4",
+  "version": "0.7.5",
   "module": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "scripts": {

data/lib/jason/lua_generator.rb

@@ -1,10 +1,13 @@
 class Jason::LuaGenerator
   ## TODO load these scripts and evalsha
   def cache_json(model_name, id, payload)
+    expiry = 7*24*60*60 + rand(6*60*60)
+
+    # ensure the content expires first
     cmd = <<~LUA
       local gidx = redis.call('INCR', 'jason:gidx')
-      redis.call( 'set', 'jason:cache:' .. ARGV[1] .. ':' .. ARGV[2] .. ':gidx', gidx )
-      redis.call( 'hset', 'jason:cache:' .. ARGV[1], ARGV[2], ARGV[3] )
+      redis.call( 'setex', 'jason:cache:' .. ARGV[1] .. ':' .. ARGV[2] .. ':gidx', #{expiry}, gidx )
+      redis.call( 'setex', 'jason:cache:' .. ARGV[1] .. ':' .. ARGV[2], #{expiry - 60}, ARGV[3] )
       return gidx
     LUA
 
@@ -15,15 +18,26 @@ class Jason::LuaGenerator
     # If value has changed, return old value and new idx. Otherwise do nothing.
     cmd = <<~LUA
       local t = {}
-      local models = {}
+      local insts = {}
+      local miss_ids = {}
       local ids = redis.call('smembers', 'jason:subscriptions:' .. ARGV[2] .. ':ids:' .. ARGV[1])
 
       for k,id in pairs(ids) do
-        models[#models+1] = redis.call( 'hget', 'jason:cache:' .. ARGV[1], id)
+        local result = redis.call( 'get', 'jason:cache:' .. ARGV[1] .. ':' .. id)
+        if (result == false) then
+          miss_ids[#miss_ids+1] = id
+        else
+          insts[#insts+1] = result
+        end
       end
 
-      t[#t+1] = models
-      t[#t+1] = redis.call( 'get', 'jason:subscription:' .. ARGV[2] .. ':' .. ARGV[1] .. ':idx' )
+      if next(miss_ids) == nil then
+        t[#t+1] = insts
+        t[#t+1] = redis.call( 'get', 'jason:subscription:' .. ARGV[2] .. ':' .. ARGV[1] .. ':idx' )
+      else
+        t[#t+1] = miss_ids
+        t[#t+1] = 'missing'
+      end
 
       return t
     LUA

data/lib/jason/publisher.rb

@@ -124,7 +124,7 @@ module Jason::Publisher
   end
 
   def jason_cached_value
-    JSON.parse($redis_jason.hget("jason:cache:#{self.class.name.underscore}", id) || '{}')
+    JSON.parse($redis_jason.get("jason:cache:#{self.class.name.underscore}:#{id}") || '{}')
   end
 
   class_methods do
@@ -132,6 +132,10 @@ module Jason::Publisher
       all.find_each(&:cache_json)
     end
 
+    def cache_for(ids)
+      where(id: ids).find_each(&:cache_json)
+    end
+
     def has_jason?
       true
     end

data/lib/jason/subscription.rb

@@ -399,16 +399,17 @@ class Jason::Subscription
   end
 
   def get_for_model(model_name)
-    if $redis_jason.sismember("jason:models:#{model_name}:all:subscriptions", id)
-      instance_jsons_hash, idx = $redis_jason.multi do |r|
-        r.hgetall("jason:cache:#{model_name}")
-        r.get("jason:subscription:#{id}:#{model_name}:idx")
-      end
-      instance_jsons = instance_jsons_hash.values
-    else
+    instance_jsons, idx = Jason::LuaGenerator.new.get_payload(model_name, id)
+    if idx == 'missing'
+      # warm cache and then retry
+      model_klass(model_name).cache_for(instance_jsons)
       instance_jsons, idx = Jason::LuaGenerator.new.get_payload(model_name, id)
     end
 
+    if instance_jsons.any? { |json| json.blank? }
+      raise Jason::MissingCacheError
+    end
+
     payload = instance_jsons.map do |instance_json|
       instance_json ? JSON.parse(instance_json) : {}
     end
@@ -437,7 +438,7 @@ class Jason::Subscription
 
   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) || '{}')
+    payload = JSON.parse($redis_jason.get("jason:cache:#{model_name}:#{instance_id}") || '{}')
 
     payload = {
       id: instance_id,
@@ -479,3 +480,5 @@ class Jason::Subscription
     broadcaster.broadcast(payload)
   end
 end
+
+class Jason::MissingCacheError < StandardError; end

data/lib/jason/version.rb

@@ -1,3 +1,3 @@
 module Jason
-  VERSION = "0.7.5"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jason-rails
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.8.0
 platform: ruby
 authors:
 - James Rees
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-23 00:00:00.000000000 Z
+date: 2022-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails