jason-rails 0.3.0 → 0.4.0

data/config/routes.rb

@@ -0,0 +1,4 @@
+Jason::Engine.routes.draw do
+  get '/api/schema', to: 'api#schema'
+  post '/api/action', to: 'api#action'
+end

data/jason-rails.gemspec

@@ -22,4 +22,9 @@ Gem::Specification.new do |spec|
   end
   spec.executables   = []
   spec.require_paths = ["lib"]
+
+  spec.add_dependency "rails", ">= 5"
+  spec.add_dependency "connection_pool", ">= 2.2.3"
+  spec.add_dependency "redis", ">= 4"
+  spec.add_dependency "jsondiff"
 end

data/lib/jason.rb

@@ -1,10 +1,16 @@
+require 'connection_pool'
+require 'redis'
+require 'jsondiff'
+
 require "jason/version"
 require 'jason/api_model'
 require 'jason/channel'
 require 'jason/publisher'
 require 'jason/subscription'
+require 'jason/engine'
 
 module Jason
   class Error < StandardError; end
-  # Your code goes here...
+
+  $redis_jason = ::ConnectionPool::Wrapper.new(size: 5, timeout: 3) { ::Redis.new(url: ENV['REDIS_URL']) }
 end

data/lib/jason/api_model.rb

@@ -15,6 +15,10 @@ class Jason::ApiModel
     model.allowed_params || []
   end
 
+  def allowed_object_params
+    model.allowed_object_params || []
+  end
+
   def include_models
     model.include_models || []
   end
@@ -35,6 +39,18 @@ class Jason::ApiModel
     model.scope
   end
 
+  def permit(params)
+    pp self
+    pp params
+    params = params.require(:payload).permit(allowed_params).tap do |allowed|
+      pp "ALLOWED"
+      pp allowed
+      allowed_object_params.each do |key|
+        allowed[key] = params[:payload][key].to_unsafe_h if params[:payload][key]
+      end
+    end
+  end
+
   def as_json_config
     include_configs = include_models.map do |assoc|
       reflection = name.classify.constantize.reflect_on_association(assoc.to_sym)

data/lib/jason/channel.rb

@@ -24,8 +24,8 @@ class Jason::Channel < ActionCable::Channel::Base
         #   stream_from s.channel
         # end
       elsif (data = message['getPayload'])
-        config = data.config
-        model = data.model
+        config = data['config']
+        model = data['model']
         Jason::Subscription.new(config: config).get(model.to_s.underscore)
       end
     rescue => e

data/lib/jason/engine.rb

@@ -0,0 +1,5 @@
+module Jason
+  class Engine < ::Rails::Engine
+    isolate_namespace Jason
+  end
+end

data/lib/jason/publisher.rb

@@ -7,17 +7,16 @@ module Jason::Publisher
 
     if self.persisted? && (scope.blank? || self.class.unscoped.send(scope).exists?(self.id))
       payload = self.reload.as_json(as_json_config)
-      $redis.hset("jason:#{self.class.name.underscore}:cache", self.id, payload.to_json)
+      $redis_jason.hset("jason:#{self.class.name.underscore}:cache", self.id, payload.to_json)
     else
-      $redis.hdel("jason:#{self.class.name.underscore}:cache", self.id)
+      $redis_jason.hdel("jason:#{self.class.name.underscore}:cache", self.id)
     end
   end
 
   def publish_json
     cache_json
     return if skip_publish_json
-    subscriptions = $redis.hgetall("jason:#{self.class.name.underscore}:subscriptions")
-    subscriptions.each do |id, config_json|
+    self.class.jason_subscriptions.each do |id, config_json|
       config = JSON.parse(config_json)
 
       if (config['conditions'] || {}).all? { |field, value| self.send(field) == value }
@@ -33,7 +32,11 @@ module Jason::Publisher
 
   class_methods do
     def subscriptions
-      $redis.hgetall("jason:#{self.name.underscore}:subscriptions")
+      $redis_jason.hgetall("jason:#{self.name.underscore}:subscriptions")
+    end
+
+    def jason_subscriptions
+      $redis_jason.hgetall("jason:#{self.name.underscore}:subscriptions")
     end
 
     def publish_all(instances)
@@ -45,7 +48,7 @@ module Jason::Publisher
     end
 
     def flush_cache
-      $redis.del("jason:#{self.name.underscore}:cache")
+      $redis_jason.del("jason:#{self.name.underscore}:cache")
     end
 
     def setup_json
@@ -69,6 +72,35 @@ module Jason::Publisher
         }
       end
     end
+
+    def find_or_create_by_id(params)
+      object = find_by(id: params[:id])
+
+      if object
+        object.update(params)
+      elsif params[:hidden]
+        return false ## If an object is passed with hidden = true but didn't already exist, it's safe to never create it
+      else
+        object = create!(params)
+      end
+
+      object
+    end
+
+    def find_or_create_by_id!(params)
+      object = find_by(id: params[:id])
+
+      if object
+        object.update!(params)
+      elsif params[:hidden]
+        ## TODO: We're diverging from semantics of the Rails bang! methods here, which would normally either raise or return an object. Find a way to make this better.
+        return false ## If an object is passed with hidden = true but didn't already exist, it's safe to never create it
+      else
+        object = create!(params)
+      end
+
+      object
+    end
   end
 
   included do

data/lib/jason/subscription.rb

@@ -4,7 +4,7 @@ class Jason::Subscription
   def initialize(id: nil, config: nil)
     if id
       @id = id
-      raw_config = $redis.hgetall("jason:subscriptions:#{id}").map { |k,v| [k, JSON.parse(v)] }.to_h.with_indifferent_access
+      raw_config = $redis_jason.hgetall("jason:subscriptions:#{id}").map { |k,v| [k, JSON.parse(v)] }.to_h.with_indifferent_access
       set_config(raw_config)
     else
       @id = Digest::MD5.hexdigest(config.to_json)
@@ -18,30 +18,28 @@ class Jason::Subscription
 
   def configure(raw_config)
     set_config(raw_config)
-    $redis.hmset("jason:subscriptions:#{id}", *config.map { |k,v| [k, v.to_json]}.flatten)
+    $redis_jason.hmset("jason:subscriptions:#{id}", *config.map { |k,v| [k, v.to_json]}.flatten)
   end
 
   def destroy
     config.each do |model, value|
-      $redis.srem("jason:#{model.to_s.underscore}:subscriptions", id)
+      $redis_jason.srem("jason:#{model.to_s.underscore}:subscriptions", id)
     end
-    $redis.del("jason:subscriptions:#{id}")
+    $redis_jason.del("jason:subscriptions:#{id}")
   end
 
   def add_consumer(consumer_id)
     before_consumer_count = consumer_count
-    $redis.sadd("jason:subscriptions:#{id}:consumers", consumer_id)
-    $redis.hset("jason:consumers", consumer_id, Time.now.utc)
+    $redis_jason.sadd("jason:subscriptions:#{id}:consumers", consumer_id)
+    $redis_jason.hset("jason:consumers", consumer_id, Time.now.utc)
 
-    if before_consumer_count == 0
-      add_subscriptions
-      publish_all
-    end
+    add_subscriptions
+    publish_all
   end
 
   def remove_consumer(consumer_id)
-    $redis.srem("jason:subscriptions:#{id}:consumers", consumer_id)
-    $redis.hdel("jason:consumers", consumer_id)
+    $redis_jason.srem("jason:subscriptions:#{id}:consumers", consumer_id)
+    $redis_jason.hdel("jason:consumers", consumer_id)
 
     if consumer_count == 0
       remove_subscriptions
@@ -49,7 +47,7 @@ class Jason::Subscription
   end
 
   def consumer_count
-    $redis.scard("jason:subscriptions:#{id}:consumers")
+    $redis_jason.scard("jason:subscriptions:#{id}:consumers")
   end
 
   def channel
@@ -67,14 +65,14 @@ class Jason::Subscription
 
   def add_subscriptions
     config.each do |model, value|
-      $redis.hset("jason:#{model.to_s.underscore}:subscriptions", id, value.to_json)
+      $redis_jason.hset("jason:#{model.to_s.underscore}:subscriptions", id, value.to_json)
       update(model)
     end
   end
 
   def remove_subscriptions
     config.each do |model, _|
-      $redis.hdel("jason:#{model.to_s.underscore}:subscriptions", id)
+      $redis_jason.hdel("jason:#{model.to_s.underscore}:subscriptions", id)
     end
   end
 
@@ -86,8 +84,8 @@ class Jason::Subscription
   end
 
   def get(model)
-    value = JSON.parse($redis.get("#{channel}:#{model}:value") || '{}')
-    idx = $redis.get("#{channel}:#{model}:idx").to_i
+    value = JSON.parse($redis_jason.get("#{channel}:#{model}:value") || '[]')
+    idx = $redis_jason.get("#{channel}:#{model}:idx").to_i
 
     {
       type: 'payload',
@@ -113,7 +111,7 @@ class Jason::Subscription
   def get_throttle
     if !$throttle_rate || !$throttle_timeout || Time.now.utc > $throttle_timeout
       $throttle_timeout = Time.now.utc + 5.seconds
-      $throttle_rate = (Sidekiq.redis { |r| r.get 'global_throttle_rate' } || 0).to_i
+      $throttle_rate = ($redis_jason.get('global_throttle_rate') || 0).to_i
     else
       $throttle_rate
     end
@@ -124,15 +122,15 @@ class Jason::Subscription
     start_time = Time.now.utc
     conditions = config[model]['conditions']
 
-    value = $redis.hgetall("jason:#{model}:cache")
+    value = $redis_jason.hgetall("jason:#{model}:cache")
       .values.map { |v| JSON.parse(v) }
       .select { |v| (conditions || {}).all? { |field, value| v[field] == value } }
       .sort_by { |v| v['id'] }
 
     # lfsa = last finished, started at
     # If another job that started after this one, finished before this one, skip sending this state update
-    if Time.parse(Sidekiq.redis { |r| r.get("jason:#{channel}:lfsa") || '1970-01-01 00:00:00 UTC' } ) < start_time
-      Sidekiq.redis { |r| r.set("jason:#{channel}:lfsa", start_time) }
+    if Time.parse($redis_jason.get("jason:#{channel}:lfsa") || '1970-01-01 00:00:00 UTC') < start_time
+      $redis_jason.set("jason:#{channel}:lfsa", start_time)
     else
       return
     end
@@ -149,12 +147,11 @@ class Jason::Subscription
       end
     LUA
 
-    result = $redis.eval cmd, [], ["#{channel}:#{model}", value.to_json]
+    result = $redis_jason.eval cmd, [], ["#{channel}:#{model}", value.to_json]
     return if result.blank?
 
     idx = result[0]
-    old_value = JSON.parse(result[1] || '{}')
-
+    old_value = JSON.parse(result[1] || '[]')
     diff = get_diff(old_value, value)
 
     end_time = Time.now.utc

data/lib/jason/version.rb

@@ -1,3 +1,3 @@
 module Jason
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,15 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: jason-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - James Rees
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-04 00:00:00.000000000 Z
-dependencies: []
+date: 2020-12-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5'
+- !ruby/object:Gem::Dependency
+  name: connection_pool
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.3
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4'
+- !ruby/object:Gem::Dependency
+  name: jsondiff
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description:
 email:
 - jarees@gmail.com
@@ -22,11 +78,22 @@ files:
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
+- app/assets/config/jason_engine_manifest.js
+- app/assets/images/jason/engine/.keep
+- app/assets/stylesheets/jason/engine/application.css
+- app/controllers/jason/api_controller.rb
+- app/helpers/jason/engine/application_helper.rb
+- app/jobs/jason/engine/application_job.rb
+- app/mailers/jason/engine/application_mailer.rb
+- app/models/jason/engine/application_record.rb
+- app/views/layouts/jason/engine/application.html.erb
 - bin/console
 - bin/setup
+- client/babel.config.js
 - client/lib/JasonContext.d.ts
 - client/lib/JasonContext.js
 - client/lib/JasonProvider.d.ts
@@ -37,8 +104,14 @@ files:
 - client/lib/createActions.js
 - client/lib/createJasonReducers.d.ts
 - client/lib/createJasonReducers.js
+- client/lib/createOptDis.d.ts
+- client/lib/createOptDis.js
 - client/lib/createPayloadHandler.d.ts
 - client/lib/createPayloadHandler.js
+- client/lib/deepCamelizeKeys.d.ts
+- client/lib/deepCamelizeKeys.js
+- client/lib/deepCamelizeKeys.test.d.ts
+- client/lib/deepCamelizeKeys.test.js
 - client/lib/index.d.ts
 - client/lib/index.js
 - client/lib/makeEager.d.ts
@@ -53,17 +126,22 @@ files:
 - client/src/actionFactory.ts
 - client/src/createActions.ts
 - client/src/createJasonReducers.ts
+- client/src/createOptDis.ts
 - client/src/createPayloadHandler.ts
+- client/src/deepCamelizeKeys.test.ts
+- client/src/deepCamelizeKeys.ts
 - client/src/index.ts
 - client/src/makeEager.ts
 - client/src/useAct.ts
 - client/src/useSub.ts
 - client/tsconfig.json
 - client/yarn.lock
+- config/routes.rb
 - jason-rails.gemspec
 - lib/jason.rb
 - lib/jason/api_model.rb
 - lib/jason/channel.rb
+- lib/jason/engine.rb
 - lib/jason/publisher.rb
 - lib/jason/subscription.rb
 - lib/jason/version.rb