jason-rails 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 627690fe30b3378cde9c9f148cc8d8d6941bcd540cbbe4777898fa8917f86dc8
-  data.tar.gz: bd3af795626563a049c02045b8dc82018882067f9b2d582e4152e1bd6b34af4c
+  metadata.gz: 48abc57aac9f4529a93812d46422ac21d48e58432fc21e570f1801b84a3ac436
+  data.tar.gz: ac21dab5464e5dd254a1a223a80581c1410c928bab4c0fbc9fe32cdfedb7c474
 SHA512:
-  metadata.gz: 4ed1a231161d3eafc616549eebd38c531c29203842f1ab8d0697e953f0d9af8a4766285b8733fa0d92ae1cd7893560f3d660c920385c0b7335f41cfa5f8c9387
-  data.tar.gz: 7289710ebc49e0c53c7bdd52106d0e8153bc4505d98b26251966ccff63895e4c6c5a6ac2009b904bbf3d7d3b552c71ffebe0f17786998aaf9eaedafbf12710fb
+  metadata.gz: '09c42d2b035af32efdc006224e3e81fa398d2327199845640ff7c710c7cecbd0c5edd9d18e441b5b3fefb2a356f45159c77194ed72f866880171071fb302c422'
+  data.tar.gz: 1b5f4f16a5032ca96f8106dc4fff8c8a1a1d5792392b4ed28ad9f1c8974848dec5359e4bb0bc675463cc923e5f77552b6bcfda6c733bf72bb66f156648ce521c

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## v0.6.6
+- Fix: don't run the schema change detection and cache rebuild inside rake tasks or migrations
+
 ## v0.6.5
 - Added `reset!` and `reset!(hard: true)` methods to `Subscription`. Reset will load the IDs that should be part of the subscription from the database, and ensure that the graph matches those. It then re-broadcasts the payloads to all connected clients. Hard reset will do the same, but also clear all cached IDs and subscription hooks on instances - this is equivalent from starting from scratch.
 - Added `enforce: boolean` option to GraphHelper

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jason-rails (0.6.4)
+    jason-rails (0.6.6)
       connection_pool (>= 2.2.3)
       jsondiff
       rails (>= 5)
@@ -93,7 +93,7 @@ GEM
     mini_mime (1.0.2)
     mini_portile2 (2.5.0)
     minitest (5.14.3)
-    nio4r (2.5.4)
+    nio4r (2.5.5)
     nokogiri (1.11.1)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
@@ -153,6 +153,10 @@ GEM
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
     rspec-support (3.10.0)
+    sidekiq (6.1.3)
+      connection_pool (>= 2.2.2)
+      rack (~> 2.0)
+      redis (>= 4.2.0)
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -178,6 +182,7 @@ DEPENDENCIES
   rake (~> 12.0)
   rspec (~> 3.0)
   rspec-rails
+  sidekiq
   sqlite3
 
 BUNDLED WITH

data/app/controllers/jason/{api_controller.rb → jason_controller.rb}

@@ -1,4 +1,4 @@
-class Jason::ApiController < ::ApplicationController
+class Jason::JasonController < ::ApplicationController
   before_action :load_and_authorize_subscription, only: [:create_subscription, :remove_subscription, :get_payload]
   # config seems to be a reserved name, resulting in infinite loop
   def configuration

data/app/controllers/jason/{api/pusher_controller.rb → pusher_controller.rb}

@@ -1,4 +1,4 @@
- class Jason::Api::PusherController < ApplicationController
+ class Jason::PusherController < ApplicationController
   skip_before_action :verify_authenticity_token
 
   def auth

data/app/workers/jason/outbound_message_queue_worker.rb

@@ -0,0 +1,21 @@
+class Jason::OutboundMessageQueueWorker
+  include Sidekiq::Worker
+
+  def perform
+    batch = get_batch
+    return if batch.size == 0
+
+    Jason.pusher.trigger_batch(batch)
+  end
+
+  private
+
+  def get_batch
+    batch_json = $redis_jason.multi do |r|
+      r.lrange("jason:outbound_message_queue", 0, 9) # get first 10 elements
+      r.ltrim("jason:outbound_message_queue", 10, -1) # delete first 10 elements
+    end[0]
+
+    batch_json.map { |event| JSON.parse(event).with_indifferent_access } # Pusher wants symbol keys
+  end
+end

data/client/package.json

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

data/config/routes.rb

@@ -1,8 +1,8 @@
 Jason::Engine.routes.draw do
-  get '/api/config', to: 'api#configuration'
-  post '/api/action', to: 'api#action'
-  post '/api/create_subscription', to: 'api#create_subscription'
-  post '/api/remove_subscription', to: 'api#remove_subscription'
-  post '/api/get_payload', to: 'api#get_payload'
-  post '/api/pusher/auth', to: 'api/pusher#auth'
+  get '/api/config', to: 'jason#configuration'
+  post '/api/action', to: 'jason#action'
+  post '/api/create_subscription', to: 'jason#create_subscription'
+  post '/api/remove_subscription', to: 'jason#remove_subscription'
+  post '/api/get_payload', to: 'jason#get_payload'
+  post '/api/pusher/auth', to: 'pusher#auth'
 end

data/jason-rails.gemspec

@@ -31,4 +31,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec-rails"
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "sidekiq"
 end

data/lib/jason.rb

@@ -24,11 +24,13 @@ module Jason
   self.mattr_accessor :pusher_region
   self.mattr_accessor :pusher_channel_prefix
   self.mattr_accessor :authorization_service
+  self.mattr_accessor :sidekiq_queue
 
   self.schema = {}
   self.transport_service = :action_cable
   self.pusher_region = 'eu'
   self.pusher_channel_prefix = 'jason'
+  self.sidekiq_queue = 'default'
 
   def self.init
     # Don't run in AR migration / generator etc.

data/lib/jason/broadcaster.rb

@@ -13,7 +13,8 @@ class Jason::Broadcaster
     if Jason.transport_service == :action_cable
       ActionCable.server.broadcast(channel, message)
     elsif Jason.transport_service == :pusher
-      Jason.pusher.trigger(pusher_channel_name, 'changed', message)
+      $redis_jason.rpush("jason:outbound_message_queue", { channel: pusher_channel_name, name: 'changed', data: message }.to_json)
+      Jason::OutboundMessageQueueWorker.perform_async
     end
   end
 end

data/lib/jason/publisher.rb

@@ -42,7 +42,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(

data/lib/jason/version.rb

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

metadata

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