collab 0.2.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3f3f1936db40a7ef5a4e74cd9d1f1e691440d385aaf1414b8bc0af99e8dd06d
-  data.tar.gz: 44c4468e3fbce3c218562a9a9278242a5b6776317b9065fbc6a8a5d88341d0e3
+  metadata.gz: 57b6b2acc480ad0a0d40fb20c82a1091b30dbea74b674a5d02339dd1bf8b7f83
+  data.tar.gz: 2a36b774b1ad0693feef4194888a07b58e8899173de10bad52a174d012a6c2f4
 SHA512:
-  metadata.gz: 06133afa987cb5d34990f8f0ba82bd7f55fb693c1f47aab9280d13f7c511acdb2b8d64b1b3bfc3e1cb4db0b4eeb948d93caefce28c4aba99c87666d4df94599e
-  data.tar.gz: 2b8d25e17ca7a08c5e175a75718d8ba758f86db94fc19e58072c886419c308ff059e9fb2370d293201e2af8a98a12d16ca7f3f63d52f7c7c848c376e3d503431
+  metadata.gz: ab13771371259f4294fd94d207889643631f541dfdc26f43dbc6b2e7a454e79de4816dc4be560d1203b70dfe82a2e8b26fb3d1bcc56172743d2ce872060ee40f
+  data.tar.gz: 0a18c044a507454196599921a00ba0ace34fb7b3230dcb2c0a06124774f5893fa77d12a373f34d91cfe556af31a8c0d41a89571da8f3c0a37d8841dd141795e1

data/lib/collab.rb

@@ -1,20 +1,18 @@
-require "collab/railtie"
+require "collab/version"
+require "collab/config"
+require "collab/js"
+require "collab/engine"
 
 module Collab
-  def self.config
-    @config ||= Collab::Config.new
-    return @config unless block_given?
-    yield @config
-  end
-
   autoload "Channel", "collab/channel"
-  autoload "Config", "collab/config"
-  autoload "Bridge", "collab/bridge"
   autoload "HasCollaborativeDocument", "collab/has_collaborative_document"
+  # autoload "DocumentSelection", "collab/selection"
+  autoload "HasTrackedDocumentPositions", "collab/has_tracked_document_positions"
   
   module Models
     autoload "Base", "collab/models/base"
     autoload "Document", "collab/models/document"
-    autoload "DocumentTransaction", "collab/models/document_transaction"
+    autoload "Commit", "collab/models/commit"
+    autoload "TrackedPosition", "collab/models/tracked_position"
   end
 end

data/lib/collab/channel.rb

@@ -1,30 +1,45 @@
 module Collab
   module Channel
-    def document; @document end
-
     def subscribed
-      @document = find_document
-
+      reject_unauthorized_connection unless @document = find_document
+  
       starting_version = params[:startingVersion]&.to_i
       raise "missing startingVersion" if starting_version.nil?
+      raise "invalid version" unless @document.possibly_saved_version? starting_version
 
-      stream_for document
+      stream_for @document
       
-      transactions = document.transactions
-                              .where("document_version > ?", starting_version)
-                              .order(document_version: :asc)
-                              .load
+      commits = @document.commits
+                         .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))
+      unless commits.empty?
+        raise "invalid version" unless commits.first.document_version == (starting_version + 1)
+        commits.lazy.map(&:as_json).each(method(:transmit))
+      end
     end
 
-    def submit(data)
-      authorize_submit!(data)
-      document.perform_transaction_later(data)
+    def commit(data)
+      @document.apply_commit(data)
     end
 
+    # def select(data)
+    #   return unless defined?(_select)
+
+    #   version    = data["v"]&.to_i
+    #   anchor_pos = data["anchor"]&.to_i
+    #   head_pos   = data["head"]&.to_i
+
+    #   return unless version && @document.possibly_saved_version?(version) && anchor_pos && head_pos
+
+    #   @document.resolve_selection(anchor_pos, head_pos, version: version) do |selection|
+    #     _select selection
+    #   end
+
+    #   transmit({ack: "select"})
+    # end
+
     def unsubscribed
       stop_all_streams # this may not be needed
     end

data/lib/collab/config.rb

@@ -1,5 +1,33 @@
 module Collab
+  @config_mutex = Mutex.new
+
+  def self.config
+    if block_given?
+      @config_mutex.synchronize do
+        @config ||= ::Collab::Config.new
+        raise "[Collab] Tried to configure gem after first use" if @config.frozen?
+        yield @config
+      end
+    else
+      raise "[Collab] Missing configuration - Have you run `rails g collab:install` yet?" unless @config
+      @config.freeze # really weird stuff could happen if the config changes after first use, so freeze config
+    end
+  end
+
   class Config
-    attr_accessor :max_transactions, :application_job, :queue_document_transaction_job_as, :schema_package, :application_record, :document_transaction_model, :document_model, :channel_name
+    attr_accessor :base_record,
+                  :channel,
+                  :commit_model,
+                  :document_model,
+                  :max_commit_history_length,
+                  :num_js_processes,
+                  :schema_package,
+                  :tracked_position_model
+
+    def initialize
+      self.document_model = "Collab::Models::Document"
+      self.commit_model = "Collab::Models::Commit"
+      self.tracked_position_model = "Collab::Models::TrackedPosition"
+    end
   end
 end

data/lib/collab/engine.rb

@@ -0,0 +1,6 @@
+if defined?(Rails)
+  module Collab
+    class Engine < ::Rails::Engine
+    end
+  end
+end

data/lib/collab/has_collaborative_document.rb

@@ -8,7 +8,7 @@ module Collab
 
         define_method attach_as do
           super() || begin
-            document = self.__send__("build_#{attach_as}", schema_name: schema, document: blank_document.dup)
+            document = self.__send__("build_#{attach_as}", schema_name: schema, content: blank_document.dup)
             document.save!
             document
           end

data/lib/collab/has_tracked_document_positions.rb

@@ -0,0 +1,34 @@
+module Collab
+  module HasTrackedDocumentPositions
+    extend ActiveSupport::Concern
+
+    class_methods do
+      def has_tracked_document_position(pos_name, optional: true)
+        has_one   pos_name.to_sym, -> { where(name: pos_name) }, class_name: ::Collab.config.tracked_position_model, as: :owner, dependent: :destroy, autosave: true
+        validates pos_name.to_sym, presence: !optional
+
+        define_method :"#{pos_name}=" do |pos|
+          pos.name = pos_name
+          super(pos)
+        end
+      end
+
+      def has_tracked_document_selection(selection_name)
+        has_tracked_document_position :"#{selection_name}_anchor"
+        has_tracked_document_position :"#{selection_name}_head"
+
+        define_method selection_name do
+          anchor = self.send(:"#{selection_name}_anchor")
+          head   = self.send(:"#{selection_name}_head")
+
+          ::Collab::DocumentSelection.new anchor, head
+        end
+
+        define_method :"#{selection_name}=" do |sel|
+          self.send(:"#{selection_name}_anchor=", sel&.anchor)
+          self.send(:"#{selection_name}_head=", sel&.head)
+        end
+      end
+    end
+  end
+end

data/lib/collab/js.rb

@@ -0,0 +1,98 @@
+require "json"
+
+module Collab
+  module JS
+    @queue = Queue.new
+    @queue_initialized = false
+    @queue_initialization_mutex = Mutex.new
+
+    class <<self
+      def queue
+        initialize_queue unless @queue_initialized
+        @queue
+      end
+
+      # Calls the block given with a JS process acquired from the queue
+      # Will block until a JS process is available
+      def with_js
+        js = queue.pop
+        yield js
+      ensure
+        queue << js
+      end
+
+      def call(name, data = nil, schema_name = nil)
+        req = {name: name, data: data, schemaPackage: ::Collab.config.schema_package}
+        req[:schemaName] = schema_name if schema_name
+        with_js { |js| js.call(JSON.generate(req)) }
+      end
+      
+      def apply_commit(document, commit, pos: nil, map_steps_through:, schema_name:)
+        call("applyCommit", {doc: document, commit: commit, mapStepsThrough: map_steps_through, pos: pos},schema_name)
+      end
+
+      def html_to_document(html, schema_name:)
+        call("htmlToDoc", html, schema_name)
+      end
+
+      def document_to_html(document, schema_name:)
+        call("docToHtml", document, schema_name)
+      end
+
+      def map_through(steps:, pos:)
+        call("mapThru", {steps: steps, pos: pos})
+      end
+
+      private 
+      # Thread-safe initialization of the NodeJS process queue
+      def initialize_queue
+        @queue_initialization_mutex.synchronize do
+          unless @queue_initialized
+            ::Collab.config.num_js_processes.times { @queue << ::Collab::JS::JSProcess.new }
+            @queue_initialized = true
+          end
+        end
+      end
+    end
+
+    class JSProcess
+      def initialize
+         @node = if defined?(Rails)
+                   Dir.chdir(Rails.root) { open_node }
+                 else
+                   open_node
+                 end
+      end
+
+      def call(req)
+        @node.puts(req)
+        res = JSON.parse(@node.gets)
+        raise ::Collab::JS::JSRuntimeError.new(res["error"]) if res["error"]
+        res["result"]
+      end
+
+      private
+      def open_node
+        IO.popen(["node", "-e", "require('@pmcp/authority/dist/rpc')"], "r+")
+      end
+    end
+
+    class JSRuntimeError < StandardError
+      def initialize(data)
+        @js_backtrace = data["stack"].split("\n").map{|f| "JavaScript #{f.strip}"} if data["stack"]
+
+        super(data["name"] + ": " + data["message"])
+      end
+
+      def backtrace
+        return unless  val = super
+        
+        if @js_backtrace
+          @js_backtrace + val
+        else
+          val
+        end
+      end
+    end
+  end
+end

data/lib/collab/models/base.rb

@@ -1,5 +1,5 @@
 module Collab
-  class Models::Base < ::Collab.config.application_record.constantize
+  class Models::Base < ::Collab.config.base_record.constantize
     self.abstract_class = true
     self.table_name_prefix = 'collab_'
   end

data/lib/collab/models/commit.rb

@@ -0,0 +1,27 @@
+module Collab
+  class Models::Commit < ::Collab::Models::Base
+    belongs_to :document, class_name: ::Collab.config.document_model
+
+    validates :steps, length: { in: 0..10, allow_nil: false }
+    validates :document_version, presence: true, numericality: {only_integer: true, greater_than_or_equal_to: 0}
+    validates :ref, length: { maximum: 36 }, if: :ref
+
+    after_create_commit :broadcast
+
+    def steps
+      super || []
+    end
+
+    def broadcast
+      ::Collab.config.channel.constantize.broadcast_to(document, {
+        "v" => document_version,
+        "steps" => steps,
+        "ref" => ref
+      })
+    end
+
+    def self.steps
+      pluck(:steps).flatten(1)
+    end
+  end
+end

data/lib/collab/models/document.rb

@@ -1,73 +1,110 @@
 module Collab
   class Models::Document < ::Collab::Models::Base
     belongs_to :attached, polymorphic: true
-    has_many :transactions, class_name: ::Collab.config.document_transaction_model, foreign_key: :document_id
 
-    validates :document, presence: true
+    with_options foreign_key: :document_id do
+      has_many :commits,           class_name: ::Collab.config.commit_model
+      has_many :tracked_positions, class_name: ::Collab.config.tracked_position_model
+    end
+
+    validates :content, presence: true
     validates :document_version, presence: true, numericality: {only_integer: true, greater_than_or_equal_to: 0}
     validates :schema_name, presence: true
 
-    before_save :nullify_serialized_html, unless: :serialized_html_fresh?
-    after_save :delete_old_transactions
-
-    # The already-serialized html version of this document
-    def serialized_html
-      return super if serialized_html_fresh?
-    end
-
-    def serialized_html_fresh?
-      serialized_html_version == document_version
-    end
+    after_save :delete_old_commits
 
-    # Serialize the document to html - will be cached if possible (somewhat expensive)
+    # Serialize the document to html, uses cached if possible.
+    # Note that this may lock the document
     def to_html
       return serialized_html if serialized_html
 
-      serialized_html = ::Collab::Bridge.current.document_to_html(self.document, schema_name: schema_name)
-      self.update! serialized_html: serialized_html, serialized_html_version: document_version
-      serialized_html
+      serialized_version = self.document_version
+      ::Collab::JS.document_to_html(self.content, schema_name: schema_name).tap do |serialized_html|
+        Thread.new do # use a thread to prevent deadlocks and avoid incuring the cost of an inline-write
+          self.with_lock do
+            self.update_attribute(:serialized_html, serialized_html) if serialized_version == self.version and self.serialized_html.nil?
+          end
+        end
+      end
     end
 
-    def from_html(html)
-      self.document = ::Collab::Bridge.current.html_to_document(html, schema_name: schema_name)
-    end
+    def apply_commit(data)
+      base_version = data["v"]&.to_i
+      steps = data["steps"]
 
-    def perform_transaction_later(data)
-      ::Collab::DocumentTransactionJob.perform_later(@document, data)
-    end
+      return false unless base_version
+      return false unless steps.is_a?(Array) && !steps.empty?
 
-    def apply_transaction_now(data)
-      return unless data["v"].is_a?(Integer)
+      self.with_lock do
+        return false unless self.possibly_saved_version? base_version
 
-      return if (data["v"] - 1) != self.document_version # if expired between queue and perform, there is no need to aquire a lock. this is an optimization - not a guarantee
-      with_lock do
-        return if (data["v"] - 1) != self.document_version # now that we've aquired a lock to the record, ensure that we're still accessing the correct version
-        
-        transaction_result = ::Collab::Bridge.current.apply_transaction(self.document, data, schema_name: self.schema_name)
-        return unless transaction_result # check to make sure the transaction succeeded
+        self.document_version += 1
+
+        original_positions = self.tracked_positions.current.distinct.pluck(:pos, :assoc).map { |(pos, assoc)| {pos: pos, assoc: assoc} }
         
-        self.document = transaction_result["doc"]
-        self.document_version = data["v"]
-        save!
+        result = ::Collab::JS.apply_commit content,
+                                          {steps: steps},
+                                           map_steps_through: self.commits.where("document_version > ?", base_version).steps,
+                                           pos: original_positions,
+                                           schema_name: schema_name
 
-        transactions.create! document_version: self.document_version, steps: data["steps"], ref: data["ref"]
+        self.content = result["doc"]
+
+        commits.create!({
+          steps: result["steps"],
+          ref: data["ref"],
+          document_version: self.document_version
+        })
+
+        self.save!
+
+        original_positions.lazy.zip(result["pos"]) do |original, res|
+          if res["deleted"]
+            tracked_positions.current.where(original).update_all deleted_at_version: self.document_version
+          elsif original[:pos] != res["pos"]
+            tracked_positions.current.where(original).update_all pos: res["pos"]
+          end
+        end
       end
+
     end
 
-    def as_json
-      {id: id, document: document, version: self.document_version}
+    def from_html(html)
+      self.content = ::Collab::JS.html_to_document(html, schema_name: schema_name)
     end
 
-    private
+    def as_json
+      {id: id, content: content, version: document_version}
+    end
 
-    def nullify_serialized_html
+    def content_will_change!
+      super
       self.serialized_html = nil
     end
 
-    def delete_old_transactions
-      cutoff = document_version - ::Collab.config.max_transactions
-      return if cutoff <= 0
-      transactions.where("document_version < ?", cutoff).delete_all
+    def possibly_saved_version?(version)
+      self.document_version >= version && self.oldest_saved_commit_version <= version
+    end
+
+    def oldest_saved_commit_version
+      v = document_version - ::Collab.config.max_commit_history_length
+      v > 0 ? v : 0
+    end
+
+    def resolve_positions(*positions, **kwargs, &block)
+      ::Collab.config.tracked_position_model.constantize.resolve(self, *positions, **kwargs, &block)
+    end
+    alias :resolve_position :resolve_positions
+
+    def resolve_selection(anchor_pos, head_pos, version:, &block)
+      ::Collab::DocumentSelection.resolve(self, anchor_pos, head_pos, version: version, &block)
+    end
+
+    private
+
+    def delete_old_commits
+      return if oldest_saved_commit_version == 0
+      commits.where("document_version < ?", oldest_saved_commit_version).delete_all
     end
   end
 end

data/lib/collab/models/tracked_position.rb

@@ -0,0 +1,45 @@
+module Collab
+  # Represents a position in the document which is tracked between commits
+  # 
+  # If the position is deleted through mapping, deleted_at_version will be set, the position will
+  # no longer be tracked,
+  #
+  class Models::TrackedPosition < ::Collab::Models::Base
+    belongs_to :document, class_name: ::Collab.config.document_model
+    belongs_to :owner, polymorphic: true
+
+    validates :pos, presence: true, numericality: {only_integer: true, greater_than_or_equal_to: 0}
+    validates :assoc, presence: true, inclusion: {in: [-1, 1]}, numericality: {only_integer: true}
+
+    validates :deleted_at_version, numericality: {only_integer: true, greater_than_or_equal_to: 0}, if: :deleted_at_version
+
+    scope :current, -> { where(deleted_at_version: nil) }
+
+    # Resolves a set of positions and yields them to the block given, returning the result of the block
+    # The document will be locked IN SHARE MODE during resolution and the block execution
+    # Positions should consist of {"pos" => number, "assoc": number}
+    # Returns false if invalid version or any position has been deleted
+    def self.resolve(document, *positions, version:)
+      raise false unless document.possibly_saved_version? version
+
+      document.with_lock("FOR SHARE") do
+        unless document.document_version == version 
+          steps = document.commits.where("document_version > ?", @mapped_to).order(document_version: :asc).pluck(:steps).flatten(1)
+
+          map_results = ::Collab::JS.map_through(steps: steps, pos: positions)["pos"]
+
+          map_results.each_with_index do |r, i|
+            return false if r["deleted"]
+            positions[i]["pos"] = r["pos"]
+          end
+        end
+
+        positions.map! do |p|
+          document.tracked_positions.current.find_or_initialize_by(pos: p["pos"], assoc: p["assoc"])
+        end
+
+        yield(*positions)
+      end
+    end
+  end
+end

data/lib/collab/selection.rb

@@ -0,0 +1,21 @@
+# module Collab
+#   class DocumentSelection
+#     attr_reader :anchor, :head
+#     def initialize(anchor, head)
+#       @anchor = anchor
+#       @head = head
+#     end
+
+#     def self.resolve(document, anchor_pos, head_pos, version:)
+#       anchor_assoc = anchor_pos > head_pos ? -1 : 1
+
+#       document.resolve_positions(
+#         {"pos" => anchor_pos, "assoc" => anchor_assoc},
+#         {"pos" => head_pos, "assoc" => anchor_assoc * -1},
+#         version: version
+#       ) do |anchor, head|
+#         yield new anchor, head
+#       end
+#     end
+#   end
+# end

data/lib/collab/version.rb

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

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

@@ -17,8 +17,10 @@ module Collab
     end
 
     def copy_files
+      @primary_key_type = Rails.application.config.generators.active_record[:primary_key_type]
+
       migration_template(
-        "create_collab_tables.rb",
+        "create_collab_tables.rb.erb",
         "db/migrate/create_collab_tables.rb",
       )
       

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

@@ -1,19 +1,29 @@
 class CollabDocumentChannel < ApplicationCable::Channel
   include Collab::Channel
 
+  def commit(data)
+    if false # replace with your own authorization logic
+      raise "authorization not implemented"
+    end
+
+    super # make sure to call super in order to process the commit
+  end
+
   private
 
   # Find the document to subscribe to based on the params passed to the channel
-  # Authorization may also be performed here (raise an error)
+  # Authorization may also be performed here (raise an error to prevent subscription)
   def find_document
     Collab::Models::Document.find(params[:document_id]).tap do |document|
-      raise "authorization failed"
+      # TODO: Replace with your own authorization logic
+      reject_unauthorized_connection
     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
+  # Uncomment this line to receive the user's selection
+  # You must allow enable syncSelection on the client
+  #
+  # def _select(selection)
+  #   ...
+  # end
 end

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

@@ -0,0 +1,41 @@
+class CreateCollabTables < ActiveRecord::Migration[6.0]
+  def change
+    create_table :collab_documents<%= ", id: #{@primary_key_type.inspect}" if @primary_key_type %> do |t|
+      t.references :attached,      null: false, index: false, polymorphic: true<%= ", type: #{@primary_key_type.inspect}" if @primary_key_type %>
+      t.string     :attached_as,   null: false
+
+      t.index   [:attached_type, :attached_id, :attached_as], name: "index_collab_documents_on_attached"
+
+      t.jsonb   :content,          null: false
+      t.string  :schema_name,      null: false
+      t.integer :document_version, null: false, default: 0
+      t.text    :serialized_html
+
+      t.timestamps
+    end
+
+    create_table :collab_commits, id: false do |t|
+      t.references :document, null: false, foreign_key: {to_table: :collab_documents}, index: false<%= ", type: #{@primary_key_type.inspect}" if @primary_key_type %>
+      t.integer    :document_version, null: false
+      t.index      [:document_id, :document_version], unique: true, order: {document_version: :asc}, name: "index_collab_commits"
+
+      t.jsonb   :steps, array: true, null: false
+      t.string  :ref
+
+      t.datetime :created_at, null: false
+    end
+
+    create_table :collab_tracked_positions<%= ", id: #{@primary_key_type.inspect}" if @primary_key_type %> do |t|
+      t.references :document, null: false, foreign_key: {to_table: :collab_documents}, index: false<%= ", type: #{@primary_key_type.inspect}" if @primary_key_type %>
+      t.references :owner, null: false, polymorphic: true, index: false<%= ", type: #{@primary_key_type.inspect}" if @primary_key_type %>
+      t.string     :name, null: false
+      
+      t.integer    :pos,   null: false
+      t.integer    :assoc, null: false, default: 1
+      t.integer    :deleted_at_version
+
+      t.index      [:document_id, :deleted_at_version, :pos], name: "index_collab_tracked_positions_on_document_pos"
+      t.index      [:owner_type, :name, :owner_id], name: "index_collab_tracked_positions_on_owner"
+    end
+  end
+end

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

@@ -4,27 +4,17 @@ Collab.config do |c|
   # To use a Git repo, see https://docs.npmjs.com/files/package.json#git-urls-as-dependencies
   c.schema_package = "prosemirror-schema-basic"
   # How many old transactions to keep per document
-  c.max_transactions = 250
+  c.max_commit_history_length = 250
+  # How many NodeJS child processes to run (shared among all threads)
+  c.num_js_processes = 3
 
-  # 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"
+  # If you change this, you must pass the value as {channel: "[ChannelName]"} in the params from the ActionCable client
+  c.channel = "CollabDocumentChannel"
 
-  # ActionJob settings
-  # ==================
-  # The base job class to use
-  c.application_job = "::ApplicationJob"
-  # The job queue to use for DocumentTransaction jobs
-  c.queue_document_transaction_job_as = :default
-
-
-  # ActiveRecord settings
-  # =====================
   # The class which models in the gem should inherit from
-  c.application_record = "::ApplicationRecord"
-  # If you want to use your own document model or document transaction model, 
-  c.document_model = "::Collab::Models::Document"
-  c.document_transaction_model = "::Collab::Models::DocumentTransaction"
+  c.base_record = "ApplicationRecord"
+  # The models to use, if you want to implement your own models
+  # c.document_model = "..."
+  # c.commit_model = "..."
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: collab
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Ben Aubin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-31 00:00:00.000000000 Z
+date: 2020-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -44,6 +44,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webpacker
+  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: puma
+  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:
 - ben@benaubin.com
@@ -52,20 +80,22 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Rakefile
-- app/jobs/collab/document_transaction_job.rb
 - lib/collab.rb
-- lib/collab/bridge.rb
 - lib/collab/channel.rb
 - lib/collab/config.rb
+- lib/collab/engine.rb
 - lib/collab/has_collaborative_document.rb
+- lib/collab/has_tracked_document_positions.rb
+- lib/collab/js.rb
 - lib/collab/models/base.rb
+- lib/collab/models/commit.rb
 - lib/collab/models/document.rb
-- lib/collab/models/document_transaction.rb
-- lib/collab/railtie.rb
+- lib/collab/models/tracked_position.rb
+- lib/collab/selection.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/create_collab_tables.rb.erb
 - lib/generators/collab/install/templates/initializer.rb
 - lib/tasks/collab_tasks.rake
 homepage: https://github.com/benaubin/rails-collab

data/app/jobs/collab/document_transaction_job.rb

@@ -1,7 +0,0 @@
-class Collab::DocumentTransactionJob < ::Collab.config.application_job.constantize
-  queue_as ::Collab.config.queue_document_transaction_job_as
-
-  def perform(document, data)
-    document.apply_transaction_now(data)
-  end
-end

data/lib/collab/bridge.rb

@@ -1,54 +0,0 @@
-require "collab/config"
-require "json"
-
-module Collab
-  class Bridge
-    class JSRuntimeError < StandardError
-      def initialize(data)
-        @js_backtrace = data["stack"].split("\n").map{|f| "JavaScript #{f.strip}"} if data["stack"]
-
-        super(data["name"] + ": " + data["message"])
-      end
-
-      def backtrace
-        return unless  val = super
-        
-        if @js_backtrace
-          @js_backtrace + val
-        else
-          val
-        end
-      end
-    end
-    
-    def initialize
-      @node = Dir.chdir(Rails.root) do
-        IO.popen(["node", "-e", "require('rails-collab-server')"], "r+")
-      end
-    end
-
-    def self.current
-      @current ||= new
-    end
-
-    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, schema_name:)
-      call("applyTransaction", {doc: document, data: transaction}, schema_name: schema_name)
-    end
-
-    def html_to_document(html, schema_name:)
-      call("htmlToDoc", html, schema_name: schema_name)
-    end
-
-    def document_to_html(document, schema_name:)
-      call("docToHtml", document, schema_name: schema_name)
-    end
-  end
-end

data/lib/collab/models/document_transaction.rb

@@ -1,22 +0,0 @@
-module Collab
-  class Models::DocumentTransaction < ::Collab::Models::Base
-    belongs_to :document, class_name: ::Collab.config.document_model
-
-    validates :steps, presence: true
-    validates :document_version, presence: true
-
-    after_create_commit :broadcast
-
-    def as_json
-      {
-        v: document_version,
-        steps: steps,
-        ref: ref
-      }
-    end
-
-    def broadcast
-      ::Collab.config.channel_name.constantize.broadcast_to(document, as_json)
-    end
-  end
-end

data/lib/collab/railtie.rb

@@ -1,4 +0,0 @@
-module Collab
-  class Railtie < ::Rails::Railtie
-  end
-end

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

@@ -1,32 +0,0 @@
-class CreateCollabTables < ActiveRecord::Migration[6.0]
-  def change
-    create_table :collab_documents, id: :uuid do |t|
-      t.references :attached, null: false, index: false, type: :uuid, polymorphic: true
-      t.string :attached_as
-      t.index [:attached_type, :attached_id, :attached_as], name: "index_collaborative_documents_on_attached"
-
-      t.string :schema_name, null: false
-
-      t.jsonb :document, null: false
-      t.integer :document_version, null: false, default: 0
-
-      t.text :serialized_html
-      t.integer :serialized_html_version
-
-      t.timestamps
-    end
-
-    create_table :collab_document_transactions, id: false do |t|
-      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
-
-      t.string :ref
-
-      t.index [:document_id, :document_version], unique: true, order: {document_version: :asc}, name: "index_collaborative_document_transactions"
-
-      t.timestamps
-    end
-  end
-end