jason-rails 0.4.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66c465280dc28e42bdd02b400ef514408a4839df70240aad2d660fc7b7dc1ed2
-  data.tar.gz: 0ae40af767936631bc8ab174682073a2ad860578ad363bdab7b7080116be2e34
+  metadata.gz: dae8eb61f7d3966c7e34ed81120a16e5c58f84d50ff6ea16ec87340d52cbf0ec
+  data.tar.gz: cd4bc1d677ec413e2368c235632410e744ab3d47f94e7c65160b7665d3a6db45
 SHA512:
-  metadata.gz: 6e27560fdd5953ef4a86cc371577b1e8e4f88d3e8f9099abd3f6fd41ad234071a348f67236c24106345acb700ffc16ed99d0036811e8d2bb29914462d89577cb
-  data.tar.gz: 8deefbe678cebd020e5439ed3264f5b016d3c066d1d24baf3c9146ee32cd8404a6ef2c6e9bda350f276f4d1775ec3a50a9c5570960228c1f253b7adaae45f7ed
+  metadata.gz: 88130bf9bd8d557478de06bcdcb8901799425e3eeaf10a47a969152c13334659c8ffe36911fa2f3c18903a81c4291118e5f0c6daa72ac7a20545c095ab19f918
+  data.tar.gz: 3e708e8b214b74cce9dc87ec07b04bf5a4d1453c7398050be657dfe0c34f7668708352d7bef7d9305ffbb1321728267cbab9ab61f03460af3f7987f7d0381253

data/.gitignore

@@ -11,4 +11,7 @@
 .rspec_status
 client/node_modules/
 
-client/yarn-error.log
+client/yarn-error.log
+*.log
+*.gem
+.DS_Store

data/.ruby-version

@@ -0,0 +1 @@
+2.7.2

data/Gemfile.lock

@@ -1,13 +1,137 @@
 PATH
   remote: .
   specs:
-    jason-rails (0.3.0)
+    jason-rails (0.6.0)
+      connection_pool (>= 2.2.3)
+      jsondiff
+      rails (>= 5)
+      redis (>= 4)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    actioncable (6.1.1)
+      actionpack (= 6.1.1)
+      activesupport (= 6.1.1)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailbox (6.1.1)
+      actionpack (= 6.1.1)
+      activejob (= 6.1.1)
+      activerecord (= 6.1.1)
+      activestorage (= 6.1.1)
+      activesupport (= 6.1.1)
+      mail (>= 2.7.1)
+    actionmailer (6.1.1)
+      actionpack (= 6.1.1)
+      actionview (= 6.1.1)
+      activejob (= 6.1.1)
+      activesupport (= 6.1.1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (6.1.1)
+      actionview (= 6.1.1)
+      activesupport (= 6.1.1)
+      rack (~> 2.0, >= 2.0.9)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.1.1)
+      actionpack (= 6.1.1)
+      activerecord (= 6.1.1)
+      activestorage (= 6.1.1)
+      activesupport (= 6.1.1)
+      nokogiri (>= 1.8.5)
+    actionview (6.1.1)
+      activesupport (= 6.1.1)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.1.1)
+      activesupport (= 6.1.1)
+      globalid (>= 0.3.6)
+    activemodel (6.1.1)
+      activesupport (= 6.1.1)
+    activerecord (6.1.1)
+      activemodel (= 6.1.1)
+      activesupport (= 6.1.1)
+    activestorage (6.1.1)
+      actionpack (= 6.1.1)
+      activejob (= 6.1.1)
+      activerecord (= 6.1.1)
+      activesupport (= 6.1.1)
+      marcel (~> 0.3.1)
+      mimemagic (~> 0.3.2)
+    activesupport (6.1.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    builder (3.2.4)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.7)
+    connection_pool (2.2.3)
+    crass (1.0.6)
     diff-lcs (1.4.4)
+    erubi (1.10.0)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    i18n (1.8.7)
+      concurrent-ruby (~> 1.0)
+    jsondiff (0.0.5)
+    loofah (2.8.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
+    method_source (1.0.0)
+    mimemagic (0.3.5)
+    mini_mime (1.0.2)
+    mini_portile2 (2.5.0)
+    minitest (5.14.3)
+    nio4r (2.5.4)
+    nokogiri (1.11.1)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    racc (1.5.2)
+    rack (2.2.3)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (6.1.1)
+      actioncable (= 6.1.1)
+      actionmailbox (= 6.1.1)
+      actionmailer (= 6.1.1)
+      actionpack (= 6.1.1)
+      actiontext (= 6.1.1)
+      actionview (= 6.1.1)
+      activejob (= 6.1.1)
+      activemodel (= 6.1.1)
+      activerecord (= 6.1.1)
+      activestorage (= 6.1.1)
+      activesupport (= 6.1.1)
+      bundler (>= 1.15.0)
+      railties (= 6.1.1)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (6.1.1)
+      actionpack (= 6.1.1)
+      activesupport (= 6.1.1)
+      method_source
+      rake (>= 0.8.7)
+      thor (~> 1.0)
     rake (12.3.3)
+    redis (4.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -20,15 +144,41 @@ GEM
     rspec-mocks (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
+    rspec-rails (4.0.2)
+      actionpack (>= 4.2)
+      activesupport (>= 4.2)
+      railties (>= 4.2)
+      rspec-core (~> 3.10)
+      rspec-expectations (~> 3.10)
+      rspec-mocks (~> 3.10)
+      rspec-support (~> 3.10)
     rspec-support (3.10.0)
+    sprockets (4.0.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.2)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.4.2)
+    thor (1.0.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    websocket-driver (0.7.3)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   jason-rails!
+  pry
   rake (~> 12.0)
   rspec (~> 3.0)
+  rspec-rails
+  sqlite3
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

data/README.md

@@ -1,10 +1,12 @@
 # Jason
 
+Jason is still in a highly experimental phase with a rapidly changing API. Production use not recommended - but please give it a try!
+
 ## The goal
 
 I wanted:
  - Automatic updates to client state based on database state
- - Automatic persistence to database
+ - Persistence to the database without many layers of passing parameters
  - Redux for awesome state management
  - Optimistic updates
 
@@ -24,22 +26,132 @@ gem 'jason-rails'
   yarn add @jamesr2323/jason
 ```
 
+You will also need have peer dependencies of `redux`, `react-redux` and `@reduxjs/toolkit`.
+
+### In Rails
+
+Include the module `Jason::Publisher` in all models you want to publish via Jason.
+
+Create a new initializer e.g. `jason.rb` which defines your schema
+
+```ruby
+Jason.setup do |config|
+  config.schema = {
+    post: {
+      subscribed_fields: [:id, :name]
+    },
+    comment: {
+      subscribed_fields: [:id]
+    },
+    user: {
+      subscribed_fields: [:id]
+    }
+  }
+end
+```
+
+### In your frontend code
+
+First you need to wrap your root component in a `JasonProvider`.
+
+```jsx
+import { JasonProvider } from '@jamesr2323/jason'
+
+return <JasonProvider>
+  <YourApp />
+</JasonProvider>
+```
+
+This is a wrapper around `react-redux` Provider component. This accepts the following props (all optional):
+
+- `reducers` - An object of reducers that will be included in `configureStore`. Make sure these do not conflict with the names of any of the models you are configuring for use with Jason
+- `extraActions` - Extra actions you want to be available via the `useAct` hook. (See below)
+This must be a function which returns an object which will be merged with the main Jason actions. The function will be passed a dispatch function, store, axios instance and the Jason actions. For example you can add actions for one of your custom slices:
+
+```js
+function extraActions(dispatch, store, restClient, act) {
+  return {
+    local: {
+      upsert: payload => dis({ type: 'local/upsert', payload })
+    }
+  }
+}
+```
+
+- `middleware` - Passed directly to `configureStore` with additional Jason middleware
+
 ## Usage
+Jason provides two custom hooks to access functionality.
+
+### useAct
+This returns an object which allows you to access actions which both update models on the server, and perform an optimistic update to the Redux store.
+
+Example
+```jsx
+import React, { useState } from 'react'
+import { useAct } from '@jamesr2323/jason'
 
-### Define your schema
+export default function PostCreator() {
+  const act = useAct()
+  const [name, setName] = useState('')
 
+  function handleClick() {
+    act.posts.add({ name })
+  }
+
+  return <div>
+    <input value={name} onChange={e => setName(e.target.value)} />
+    <button onClick={handleClick}>Add</button>
+  </div>
+}
+```
+
+### useSub
+This subscribes your Redux store to a model or set of models. It will automatically unsubscribe when the component unmounts.
+
+Example
+```jsx
+import React from 'react'
+import { useSelector } from 'react-redux'
+import { useSub } from '@jamesr2323/jason'
+import _ from 'lodash'
+
+export default function PostsList() {
+  useSub({ model: 'post', includes: ['comments'] })
+  const posts = useSelector(s => _.values(s.posts.entities))
+
+  return <div>
+    { posts.map(({ id, name }) => <div key={id}>{ name }</div>) }
+  </div>
+}
+```
+
+## Authorization
+
+By default all models can be subscribed to and updated without authentication or authorization. Probably you want to lock down access.
+
+### Authorizing subscriptions
+You can do this by providing an class to Jason in the initializer under the `subscription_authorization_service` key. This must be a class receiving a message `call` with the parameters `user`, `model`, `conditions`, `sub_models` and return true or false for whether the user is allowed to access a subscription with those parameters. You can decide the implementation details of this to be as simple or complex as your app requires.
+
+### Authorizing updates
+Similarly to authorizing subscriptions, you can do this by providing an class to Jason in the initializer under the `update_authorization_service` key. This must be a class receiving a message `call` with the parameters `user`, `model`, `instance`, `update`, `remove` and return true or false for whether the user is allowed to access a subscription with those parameters.
+
+## Roadmap
+
+Development is primarily driven by the needs of projects we're using Jason in. In no particular order, being considered is:
+- Failure handling - rolling back local state in case of an error on the server
+- Authorization - more thorough authorization integration, with utility functions for common authorizations. Allowing authorization of access to particular fields such as restricting the fields of a user that are publicly broadcast.
+- Utilities for "Draft editing" - both storing client-side copies of model trees which can be committed or discarded, as well as persisting a shadow copy to the database (to allow resumable editing, or possibly collaborative editing features)
+- Benchmark and migrate if necessary ConnectionPool::Wrapper vs ConnectionPool
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/jason. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/[USERNAME]/jason/blob/master/CODE_OF_CONDUCT.md).
 
-
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/app/controllers/jason/api/pusher_controller.rb

@@ -0,0 +1,15 @@
+ class Jason::Api::PusherController < ApplicationController
+  skip_before_action :verify_authenticity_token
+
+  def auth
+    channel_main_name = params[:channel_name].remove("private-#{Jason.pusher_channel_prefix}-")
+    subscription_id = channel_main_name.remove('jason-')
+
+    if Jason::Subscription.find_by_id(subscription_id).user_can_access?(current_user)
+      response = Pusher.authenticate(params[:channel_name], params[:socket_id])
+      return render json: response
+    else
+      return head :forbidden
+    end
+  end
+end

data/app/controllers/jason/api_controller.rb

@@ -1,6 +1,21 @@
 class Jason::ApiController < ::ApplicationController
-  def schema
-    render json: JASON_API_MODEL.to_json
+  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
+    payload = {
+      schema: Jason.schema,
+      transportService: Jason.transport_service,
+    }
+
+    if Jason.transport_service == :pusher
+      payload.merge!({
+        pusherKey: Jason.pusher_key,
+        pusherRegion: Jason.pusher_region,
+        pusherChannelPrefix: Jason.pusher_channel_prefix
+      })
+    end
+
+    render json: payload
   end
 
   def action
@@ -33,4 +48,31 @@ class Jason::ApiController < ::ApplicationController
 
     return head :ok
   end
+
+  def create_subscription
+    @subscription.add_consumer(params[:consumer_id])
+    render json: { channelName: @subscription.channel }
+  end
+
+  def remove_subscription
+    @subscription.remove_consumer(params[:consumer_id])
+  end
+
+  def get_payload
+    if params[:options].try(:[], :force_refresh)
+      @subscription.set_ids_for_sub_models
+    end
+
+    render json: @subscription.get
+  end
+
+  private
+
+  def load_and_authorize_subscription
+    config = params[:config].to_unsafe_h
+    @subscription = Jason::Subscription.upsert_by_config(config['model'], conditions: config['conditions'], includes: config['includes'])
+    if !@subscription.user_can_access?(current_user)
+      return head :forbidden
+    end
+  end
 end

data/client/lib/JasonContext.d.ts

@@ -1,2 +1,7 @@
-declare const context: any;
+/// <reference types="react" />
+declare const context: import("react").Context<{
+    actions: any;
+    subscribe: null;
+    eager: (entity: any, id: any, relations: any) => void;
+}>;
 export default context;

data/client/lib/JasonContext.js

@@ -1,5 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const react_1 = require("react");
-const context = react_1.createContext({ actions: {}, subscribe: null, eager: null });
+const eager = function (entity, id, relations) {
+    console.error("Eager called but is not implemented");
+};
+const context = react_1.createContext({ actions: {}, subscribe: null, eager });
 exports.default = context;