collab 0.1.6 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 035125d713bb0557c3201837d47b34ade974800e4d422c04e8f7705c18e7abf1
-  data.tar.gz: 4a4c6dae13075523895b6ef394db0848f7030d922a1d8b7abca2f3bd804db72a
+  metadata.gz: c3f3f1936db40a7ef5a4e74cd9d1f1e691440d385aaf1414b8bc0af99e8dd06d
+  data.tar.gz: 44c4468e3fbce3c218562a9a9278242a5b6776317b9065fbc6a8a5d88341d0e3
 SHA512:
-  metadata.gz: c34b9b5002c6d8f1b41c6198c83d78a94cdb826cdc0d53e40b3cb4438114bb12d3a6759b7a73d4cef891f5dea6775cee8fe27c719218011e23194d56cb2213ea
-  data.tar.gz: 391e56c178e49861157b4479cca2a656175ce5e72de5526483dbc21608078b68da8c0f8399bcaa5f811eb0b536f897dcf0ae50323bd525335051975838ce7dd7
+  metadata.gz: 06133afa987cb5d34990f8f0ba82bd7f55fb693c1f47aab9280d13f7c511acdb2b8d64b1b3bfc3e1cb4db0b4eeb948d93caefce28c4aba99c87666d4df94599e
+  data.tar.gz: 2b8d25e17ca7a08c5e175a75718d8ba758f86db94fc19e58072c886419c308ff059e9fb2370d293201e2af8a98a12d16ca7f3f63d52f7c7c848c376e3d503431

data/lib/collab.rb

@@ -7,6 +7,7 @@ module Collab
     yield @config
   end
 
+  autoload "Channel", "collab/channel"
   autoload "Config", "collab/config"
   autoload "Bridge", "collab/bridge"
   autoload "HasCollaborativeDocument", "collab/has_collaborative_document"

data/lib/collab/bridge.rb

@@ -23,7 +23,7 @@ module Collab
     
     def initialize
       @node = Dir.chdir(Rails.root) do
-        IO.popen(["node", "-e", %q{"require('rails-collab-server')"}], "r+")
+        IO.popen(["node", "-e", "require('rails-collab-server')"], "r+")
       end
     end
 
@@ -31,24 +31,24 @@ module Collab
       @current ||= new
     end
 
-    def call(name, data = nil, schemaName:)
-      req = {name: name, data: data, schemaPackage: ::Collab.config.schema_package, schemaName: schemaName}
+    def call(name, data = nil, schema_name:)
+      req = {name: name, data: data, schemaPackage: ::Collab.config.schema_package, schemaName: schema_name}
       @node.puts(JSON.generate(req))
       res = JSON.parse(@node.gets)
       raise ::Collab::Bridge::JSRuntimeError.new(res["error"]) if res["error"]
       res["result"]
     end
     
-    def apply_transaction(document, transaction, schemaName:)
-      call("applyTransaction", {doc: document, data: transaction}, schemaName: schemaName)
+    def apply_transaction(document, transaction, schema_name:)
+      call("applyTransaction", {doc: document, data: transaction}, schema_name: schema_name)
     end
 
-    def html_to_document(html, schemaName:)
-      call("htmlToDoc", html, schemaName: schemaName)
+    def html_to_document(html, schema_name:)
+      call("htmlToDoc", html, schema_name: schema_name)
     end
 
-    def document_to_html(document, schemaName:)
-      call("docToHtml", document, schemaName: schemaName)
+    def document_to_html(document, schema_name:)
+      call("docToHtml", document, schema_name: schema_name)
     end
   end
 end

data/lib/collab/channel.rb

@@ -0,0 +1,32 @@
+module Collab
+  module Channel
+    def document; @document end
+
+    def subscribed
+      @document = find_document
+
+      starting_version = params[:startingVersion]&.to_i
+      raise "missing startingVersion" if starting_version.nil?
+
+      stream_for document
+      
+      transactions = document.transactions
+                              .where("document_version > ?", starting_version)
+                              .order(document_version: :asc)
+                              .load
+              
+      raise "invalid version" unless transactions.first.document_version == (starting_version + 1) unless transactions.empty?
+
+      transactions.lazy.map(&:as_json).each(method(:transmit))
+    end
+
+    def submit(data)
+      authorize_submit!(data)
+      document.perform_transaction_later(data)
+    end
+
+    def unsubscribed
+      stop_all_streams # this may not be needed
+    end
+  end
+end

data/lib/collab/config.rb

@@ -1,15 +1,5 @@
 module Collab
   class Config
-    attr_accessor :max_transactions, :application_job, :queue_document_transaction_job_as, :schema_package, :application_record, :document_transaction_model, :document_model
-    
-    def find_document_for_subscribe(&block)
-      @find_document_for_subscribe unless block
-      @find_document_for_subscribe = block
-    end
-
-    def authorize_update_document(&block)
-      @authorize_update_document unless block
-      @authorize_update_document = block
-    end
+    attr_accessor :max_transactions, :application_job, :queue_document_transaction_job_as, :schema_package, :application_record, :document_transaction_model, :document_model, :channel_name
   end
 end

data/lib/collab/models/document.rb

@@ -29,8 +29,6 @@ module Collab
     end
 
     def from_html(html)
-      raise "cannot override a persisted document" if self.persisted?
-      
       self.document = ::Collab::Bridge.current.html_to_document(html, schema_name: schema_name)
     end
 

data/lib/collab/models/document_transaction.rb

@@ -16,7 +16,7 @@ module Collab
     end
 
     def broadcast
-      ::Collab::DocumentChannel.broadcast_to(document, as_json)
+      ::Collab.config.channel_name.constantize.broadcast_to(document, as_json)
     end
   end
-end
+end

data/lib/collab/version.rb

@@ -1,3 +1,3 @@
 module Collab
-  VERSION = '0.1.6'
+  VERSION = '0.2.1'
 end

data/lib/generators/collab/install/install_generator.rb

@@ -22,6 +22,8 @@ module Collab
         "db/migrate/create_collab_tables.rb",
       )
       
+      copy_file "channel.rb", "app/channels/collab_document_channel.rb"
+
       copy_file "initializer.rb", "config/initializers/collab.rb"
     end
   end

data/lib/generators/collab/install/templates/channel.rb

@@ -0,0 +1,19 @@
+class CollabDocumentChannel < ApplicationCable::Channel
+  include Collab::Channel
+
+  private
+
+  # Find the document to subscribe to based on the params passed to the channel
+  # Authorization may also be performed here (raise an error)
+  def find_document
+    Collab::Models::Document.find(params[:document_id]).tap do |document|
+      raise "authorization failed"
+    end
+  end
+
+  # Called when a client submits a transaction in order to update a document
+  # You should throw an error if unauthorized
+  def authorize_submit!
+    raise "authorization failed"
+  end
+end

data/lib/generators/collab/install/templates/create_collab_tables.rb

@@ -17,7 +17,7 @@ class CreateCollabTables < ActiveRecord::Migration[6.0]
     end
 
     create_table :collab_document_transactions, id: false do |t|
-      t.references :document, null: false, foreign_key: {to_table: :collaborative_documents}, type: :uuid, index: false
+      t.references :document, null: false, foreign_key: {to_table: :collab_documents}, type: :uuid, index: false
 
       t.jsonb :steps, array: true, null: false
       t.integer :document_version, null: false

data/lib/generators/collab/install/templates/initializer.rb

@@ -6,20 +6,11 @@ Collab.config do |c|
   # How many old transactions to keep per document
   c.max_transactions = 250
 
-  # Handlers
-  # ========
-  # Find a the document to subscribe to based on the params passed to the channel
-  # Authorization may also be performed here (raise an error)
-  # The block is executed in the scope of the ActionCable channel within #subscribe
-  c.find_document_for_subscribe do
-    Collab::Models::Document.find params[:document_id]
-  end
-  # Called when a client submits a transaction in order to update a document
-  # You should throw an error if unauthorized
-  # The block is executed in the instance of the channel
-  c.authorize_update_document do |document, transaction_data|
-    # raise "authorization failed"
-  end
+  # ActionCable settings
+  # ====================
+  # The document channel to use for collaboration
+  # If you change this, you must pass {channel: "[ChannelName]"} as subscription params to the Javascript client
+  c.channel_name = "::CollabDocumentChannel"
 
   # ActionJob settings
   # ==================

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: collab
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.1
 platform: ruby
 authors:
 - Ben Aubin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-30 00:00:00.000000000 Z
+date: 2020-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,10 +52,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Rakefile
-- app/channels/collab/document_channel.rb
 - app/jobs/collab/document_transaction_job.rb
 - lib/collab.rb
 - lib/collab/bridge.rb
+- lib/collab/channel.rb
 - lib/collab/config.rb
 - lib/collab/has_collaborative_document.rb
 - lib/collab/models/base.rb
@@ -64,6 +64,7 @@ files:
 - lib/collab/railtie.rb
 - lib/collab/version.rb
 - lib/generators/collab/install/install_generator.rb
+- lib/generators/collab/install/templates/channel.rb
 - lib/generators/collab/install/templates/create_collab_tables.rb
 - lib/generators/collab/install/templates/initializer.rb
 - lib/tasks/collab_tasks.rake

data/app/channels/collab/document_channel.rb

@@ -1,28 +0,0 @@
-class Collab::DocumentChannel < ApplicationCable::Channel
-  def subscribed
-    @document = instance_exec(::Collab.config.find_document_for_subscribe)
-
-    starting_version = params[:startingVersion]&.to_i
-    raise "missing startingVersion" if starting_version.nil?
-
-    stream_for @document
-    
-    transactions = @document.transactions
-                            .where("document_version > ?", starting_version)
-                            .order(document_version: :asc)
-                            .load
-            
-    raise "invalid version" unless transactions.first.document_version == (starting_version + 1) unless transactions.empty?
-
-    transactions.lazy.map(&:as_json).each(method(:transmit))
-  end
-
-  def submit(data)
-    instance_exec(@document, data, &::Collab.config.authorize_update_document)
-    @document.perform_transaction_later(data)
-  end
-
-  def unsubscribed
-    stop_all_streams # this may not be needed
-  end
-end