loco-rails 3.0.6 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79191fae751caacf8c4dc17551a62cb5fae5de5d69307afde0014c9c276a2d32
-  data.tar.gz: 6bcf8149cf78be74b639a054bf1b59cac8d0c098abca76e4a4738b66cda70fe1
+  metadata.gz: 14ddadb549243851cfae8f6260dbe08b6813392116f03b83d4618615598ec2d3
+  data.tar.gz: c5cdfc9d981ce63a5e8237cb794d7eb2a9d8435941070bba84f65f188e08e215
 SHA512:
-  metadata.gz: 5094696a9904e3e8a3a4ee41236aed45f818aeb87f7caf951bac577cd3c21b3f7e6c67377a32e7c31d926a6bc61d9ff0965ec4c93f8baef90f2ec67c22c5dc55
-  data.tar.gz: 5df1a26fb32cb187eb2136e4e2a2b5b554bdd2d1d9ff158d5d0f52a0e24cfbe780f6d87099320a1ea023972d8661c760e87fb101006f6749c73f64370946ae9d
+  metadata.gz: '0921bb8ffff692bede6999ae0dc2de20d1822c0ca3b5a8bac0aabcd50909a12369a6987da6b309356e4306dfd3891aea85adff8c418cce1eacabc4bd73348509'
+  data.tar.gz: f8d9d259ae99c421bcbdbf03df5fa1878ae6dd590eb835d6c432a6c6e91b103df5d5efbcdfe9daff6ae1d4fbb2bab1c193d3416b1e6213b7e134842d7f2dea48

data/app/channels/loco/notification_center_channel.rb

@@ -4,58 +4,62 @@ module Loco
   class NotificationCenterChannel < ApplicationCable::Channel
     def subscribed
       return unless loco_permissions.is_a?(Array)
+
       stream_for_resources
       return if loco_permissions.compact.size > 1
+
       SenderJob.perform_later @uuid, loco: { start_ajax_polling: true }
     end
 
     def unsubscribed
       loco_permissions.each do |resource|
         next if resource.nil? || resource.is_a?(String)
+
         UuidJob.perform_later serialize_resource(resource), @uuid, 'del'
       end
     end
 
-    def receive data
+    def receive(data)
       update_connections if data['loco'] && data['loco']['connection_check']
-      NotificationCenter.new.received_signal permissions, data
+      NotificationCenter.new.received_message permissions, data
     end
 
     protected
 
-      def stream_for_resources
-        loco_permissions.compact.each do |resource|
-          if resource.is_a? String
-            @uuid = resource
-            stream_for_resource resource
-            SenderJob.perform_later @uuid, loco: { uuid: @uuid }
-          else
-            UuidJob.perform_later serialize_resource(resource), @uuid, 'add'
-            stream_for_resource resource
-          end
+    def stream_for_resources
+      loco_permissions.compact.each do |resource|
+        if resource.is_a? String
+          @uuid = resource
+          stream_for_resource resource
+          SenderJob.perform_later @uuid, loco: { uuid: @uuid }
+        else
+          UuidJob.perform_later serialize_resource(resource), @uuid, 'add'
+          stream_for_resource resource
         end
       end
+    end
 
-      def stream_for_resource resource
-        identifier = WsConnectionManager.new(resource).identifier
-        stream_from "loco:notification_center:#{identifier}"
-      end
+    def stream_for_resource(resource)
+      identifier = WsConnectionManager.new(resource).identifier
+      stream_from "loco:notification_center:#{identifier}"
+    end
 
-      def permissions
-        loco_permissions.compact.map do |o|
-          [o.class.name.downcase.to_sym, o]
-        end.to_h
+    def permissions
+      loco_permissions.compact.index_by do |o|
+        o.class.name.downcase.to_sym
       end
+    end
 
-      def update_connections
-        permissions.each do |key, val|
-          next if key == :string
-          UuidJob.perform_later serialize_resource(val), @uuid, 'update'
-        end
-      end
+    def update_connections
+      permissions.each do |key, val|
+        next if key == :string
 
-      def serialize_resource resource
-        { 'class' => resource.class.name, 'id' => resource.id }
+        UuidJob.perform_later serialize_resource(val), @uuid, 'update'
       end
+    end
+
+    def serialize_resource(resource)
+      { 'class' => resource.class.name, 'id' => resource.id }
+    end
   end
 end

data/app/controllers/loco/notification_center_controller.rb

@@ -16,43 +16,46 @@ module Loco
 
     private
 
-      def fetch_notifications
-        if params[:synced_at].blank?
-          render json: [[], Time.current.iso8601(6)]
-          return
-        end
-        fetcher = Notification::Fetcher.new notif_fetcher_args
-        render json: [
-          fetcher.formatted_notifications,
-          fetcher.next_sync_time.iso8601(6)
-        ]
+    def fetch_notifications
+      if params[:synced_at].blank?
+        render json: [[], Time.current.iso8601(6)]
+        return
       end
+      fetcher = Notification::Fetcher.new notif_fetcher_args
+      render json: [
+        fetcher.formatted_notifications,
+        fetcher.next_sync_time.iso8601(6)
+      ]
+    end
 
-      def notif_fetcher_args
-        {
-          synced_at: params[:synced_at],
-          permissions: permissions,
-          recipient_token: params[:token]
-        }
-      end
+    def notif_fetcher_args
+      {
+        synced_at: params[:synced_at],
+        permissions: permissions,
+        recipient_token: params[:token]
+      }
+    end
 
-      def permissions
-        return [] unless defined? loco_permissions
-        return loco_permissions if params[:uuid].blank?
-        process_loco_permissions
-      end
+    def permissions
+      return [] unless defined? loco_permissions
+      return loco_permissions if params[:uuid].blank?
 
-      def process_loco_permissions
-        resources_to_del = []
-        resources_to_add = []
-        loco_permissions.each do |resource|
-          next if resource.nil?
-          ws_conn_manager = WsConnectionManager.new resource
-          next unless ws_conn_manager.connected?(params[:uuid])
-          resources_to_del << resource
-          resources_to_add << resource.class
-        end
-        loco_permissions - resources_to_del + resources_to_add.uniq
+      process_loco_permissions
+    end
+
+    def process_loco_permissions
+      resources_to_del = []
+      resources_to_add = []
+      loco_permissions.each do |resource|
+        next if resource.nil?
+
+        ws_conn_manager = WsConnectionManager.new resource
+        next unless ws_conn_manager.connected?(params[:uuid])
+
+        resources_to_del << resource
+        resources_to_add << resource.class
       end
+      loco_permissions - resources_to_del + resources_to_add.uniq
+    end
   end
 end

data/app/jobs/loco/sender_job.rb

@@ -4,7 +4,7 @@ module Loco
   class SenderJob < ActiveJob::Base
     queue_as :loco
 
-    def perform recipient, data
+    def perform(recipient, data)
       Sender.new(recipient, data).emit
     end
   end

data/app/jobs/loco/uuid_job.rb

@@ -4,9 +4,10 @@ module Loco
   class UuidJob < ActiveJob::Base
     queue_as :loco
 
-    def perform serialized_resource, uuid, action
+    def perform(serialized_resource, uuid, action)
       ws_conn_manager = init_ws_conn_manager serialized_resource
       return unless ws_conn_manager
+
       case action
       when 'add'
         add ws_conn_manager, uuid
@@ -19,30 +20,32 @@ module Loco
 
     protected
 
-      def add ws_conn_manager, uuid
-        ws_conn_manager.add uuid
-        WsConnectedResourcesManager.add ws_conn_manager.identifier
-      end
+    def add(ws_conn_manager, uuid)
+      ws_conn_manager.add uuid
+      WsConnectedResourcesManager.add ws_conn_manager.identifier
+    end
 
-      def del ws_conn_manager, uuid
-        ws_conn_manager.del uuid
-        return if ws_conn_manager.connected_uuids.any?
-        WsConnectedResourcesManager.del ws_conn_manager.identifier
-      end
+    def del(ws_conn_manager, uuid)
+      ws_conn_manager.del uuid
+      return if ws_conn_manager.connected_uuids.any?
 
-      def update ws_conn_manager, uuid
-        ws_conn_manager.update uuid
-        WsConnectedResourcesManager.add ws_conn_manager.identifier
-      end
+      WsConnectedResourcesManager.del ws_conn_manager.identifier
+    end
 
-      def deserialize_resource hash
-        hash['class'].constantize.find_by id: hash['id']
-      end
+    def update(ws_conn_manager, uuid)
+      ws_conn_manager.update uuid
+      WsConnectedResourcesManager.add ws_conn_manager.identifier
+    end
 
-      def init_ws_conn_manager serialized_resource
-        resource = deserialize_resource serialized_resource
-        return unless resource
-        WsConnectionManager.new resource
-      end
+    def deserialize_resource(hash)
+      hash['class'].constantize.find_by id: hash['id']
+    end
+
+    def init_ws_conn_manager(serialized_resource)
+      resource = deserialize_resource serialized_resource
+      return unless resource
+
+      WsConnectionManager.new resource
+    end
   end
 end

data/app/models/loco/notification.rb

@@ -17,7 +17,7 @@ module Loco
       end
     end
 
-    def obj= val
+    def obj=(val)
       if val.instance_of? Class
         self.obj_class = val.to_s
       else
@@ -27,9 +27,10 @@ module Loco
       end
     end
 
-    def recipient= val
+    def recipient=(val)
       return if val.nil?
       return if val == :all
+
       if val.is_a? String
         self.recipient_token = val
       elsif val.instance_of? Class
@@ -40,10 +41,11 @@ module Loco
       end
     end
 
-    def recipient opts = {}
+    def recipient(opts = {})
       return recipient_token if recipient_token
       return unless regular_recipient?
       return class_recipient unless recipient_id
+
       obj_recipient opts[:shallow]
     end
 
@@ -58,40 +60,42 @@ module Loco
 
     private
 
-      def regular_recipient?
-        recipient_class && recipient_id
-      end
+    def regular_recipient?
+      recipient_class && recipient_id
+    end
 
-      def class_recipient
-        recipient_class.constantize
-      end
+    def class_recipient
+      recipient_class.constantize
+    end
 
-      def obj_recipient shallow = false
-        if shallow
-          recipient_class.constantize.new id: recipient_id
-        else
-          recipient_class.constantize.find recipient_id
-        end
+    def obj_recipient(shallow = false)
+      if shallow
+        recipient_class.constantize.new id: recipient_id
+      else
+        recipient_class.constantize.find recipient_id
       end
+    end
 
-      def set_event
-        return if event.present?
-        return if obj.instance_of? Class
-        if obj.new_record?
-          self.event = 'creating'
-        else
-          set_event_for_persisted_obj
-        end
-      end
+    def set_event
+      return if event.present?
+      return if obj.instance_of? Class
 
-      def set_event_for_persisted_obj
-        self.event = obj.created_at == obj.updated_at ? 'created' : 'updated'
+      if obj.new_record?
+        self.event = 'creating'
+      else
+        set_event_for_persisted_obj
       end
+    end
 
-      def set_data
-        self.data ||= {}
-        return if obj.nil?
-        self.data.merge!(id: obj.id)
-      end
+    def set_event_for_persisted_obj
+      self.event = obj.created_at == obj.updated_at ? 'created' : 'updated'
+    end
+
+    def set_data
+      self.data ||= {}
+      return if obj.nil?
+
+      self.data.merge!(id: obj.id)
+    end
   end
 end

data/app/services/loco/notification/fetcher.rb

@@ -32,56 +32,58 @@ module Loco
 
       private
 
-        def sync_time
-          Time.zone.parse @synced_at
-        end
+      def sync_time
+        Time.zone.parse @synced_at
+      end
 
-        def default_scope
-          Notification.order('created_at ASC')
-                      .where('created_at > ?', sync_time)
-        end
+      def default_scope
+        Notification.order('created_at ASC')
+                    .where('created_at > ?', sync_time)
+      end
 
-        # OPTIMIZE: one query
-        def notifications
-          return @notifications if @notifications
-          notifications = notifications_for_all
-          notifications += notifications_behind_permissions
-          notifications += notifications_behind_token if @recipient_token
-          @notifications = notifications.sort_by(&:created_at)[0, max_size]
-        end
+      # OPTIMIZE: one query
+      def notifications
+        return @notifications if @notifications
 
-        def notifications_for_all
-          default_scope.where(
-            recipient_class: nil,
-            recipient_id: nil,
-            recipient_token: nil
-          ).first max_size
-        end
+        notifications = notifications_for_all
+        notifications += notifications_behind_permissions
+        notifications += notifications_behind_token if @recipient_token
+        @notifications = notifications.sort_by(&:created_at)[0, max_size]
+      end
 
-        def notifications_behind_permissions
-          notifications = []
-          @permissions.each do |resource|
-            next unless resource
-            notifications += notification_for_resource resource
-          end
-          notifications
-        end
+      def notifications_for_all
+        default_scope.where(
+          recipient_class: nil,
+          recipient_id: nil,
+          recipient_token: nil
+        ).first max_size
+      end
 
-        def notifications_behind_token
-          default_scope.where(recipient_token: @recipient_token).first max_size
+      def notifications_behind_permissions
+        notifications = []
+        @permissions.each do |resource|
+          next unless resource
+
+          notifications += notification_for_resource resource
         end
+        notifications
+      end
 
-        def notification_for_resource resource
-          if resource.instance_of? Class
-            sql = 'recipient_class = ? AND recipient_id IS NULL'
-            return default_scope.where(sql, resource.to_s).first max_size
-          end
-          klass = resource.class.name
-          cond1 = '(recipient_class = ? AND recipient_id = ?)'
-          cond2 = '(recipient_class = ? AND recipient_id IS NULL)'
-          sql = "#{cond1} OR #{cond2}"
-          default_scope.where(sql, klass, resource.id, klass).first max_size
+      def notifications_behind_token
+        default_scope.where(recipient_token: @recipient_token).first max_size
+      end
+
+      def notification_for_resource(resource)
+        if resource.instance_of? Class
+          sql = 'recipient_class = ? AND recipient_id IS NULL'
+          return default_scope.where(sql, resource.to_s).first max_size
         end
+        klass = resource.class.name
+        cond1 = '(recipient_class = ? AND recipient_id = ?)'
+        cond2 = '(recipient_class = ? AND recipient_id IS NULL)'
+        sql = "#{cond1} OR #{cond2}"
+        default_scope.where(sql, klass, resource.id, klass).first max_size
+      end
     end
   end
 end

data/lib/generators/loco/file_injector/file_injector_generator.rb

@@ -5,30 +5,21 @@ module Loco
     source_root File.expand_path('templates', __dir__)
 
     def routes
-      file_path = Rails.root.join 'config', 'routes.rb'
+      file_path = Rails.root.join 'config/routes.rb'
       line = %(  mount Loco::Engine => '/notification-center'\n\n)
       str = "Rails.application.routes.draw do\n"
       inject_into_file file_path, line, after: str
     end
 
     def application_controller
-      file_path = Rails.root.join(
-        'app',
-        'controllers',
-        'application_controller.rb'
-      )
+      file_path = Rails.root.join 'app/controllers/application_controller.rb'
       data = File.read find_in_source_paths('application_controller.rb')
       after_line = "class ApplicationController < ActionController::Base\n"
       inject_into_file file_path, data, after: after_line
     end
 
     def connection
-      file_path = Rails.root.join(
-        'app',
-        'channels',
-        'application_cable',
-        'connection.rb'
-      )
+      file_path = Rails.root.join 'app/channels/application_cable/connection.rb'
       data = File.read find_in_source_paths('connection.rb')
       inject_into_class file_path, 'Connection', data
     end

data/lib/generators/loco/initializer/templates/initializer.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-Loco::Config.configure(
-  silence_logger: false,        # false by default
-  notifications_size: 100,      # 100 by default
-  app_name: "loco_#{Rails.env}" # your app's name (required for namespacing)
-)
+Loco.configure do |c|
+  c.silence_logger = false          # false by default
+  c.notifications_size = 100        # 100 by default
+  c.app_name = "loco_#{Rails.env}"  # your app's name (required for namespacing)
+end

data/lib/generators/loco/notification_center/USAGE

@@ -1,5 +1,5 @@
 Description:
-    Creates a notification center where you can receive signals sent by JS clients through WebSockets.
+    Creates a notification center where you can receive messages sent by JS clients through WebSockets.
 
 Example:
     rails generate loco:notification_center

data/lib/generators/loco/notification_center/templates/services/loco/notification_center.rb

@@ -4,8 +4,8 @@ module Loco
   class NotificationCenter
     include Emitter
 
-    def received_signal permissions, data
-      # handle signals here
+    def received_message(permissions, data)
+      # handle messages here
     end
   end
 end

data/lib/loco-rails.rb

@@ -14,4 +14,12 @@ require 'loco/ws_connected_resources_manager'
 require 'loco/ws_connection_storage'
 
 module Loco
+  module_function
+
+  def configure
+    Config::CONFIGURATION.new.tap do |config|
+      yield config
+      Config.configure config
+    end
+  end
 end

data/lib/loco/broadcaster.rb

@@ -4,7 +4,7 @@ module Loco
   class Broadcaster
     attr_reader :obj, :event, :recipients, :data, :notifications
 
-    def initialize obj, event = nil, opts = {}
+    def initialize(obj, event = nil, opts = {})
       recipient_key = opts[:for] ? :for : :to
       @obj = obj
       @event = event
@@ -15,15 +15,6 @@ module Loco
       @conn_res_manager = WsConnectedResourcesManager.new @recipients.compact
     end
 
-    def signals
-      notifications
-    end
-
-    def prepare
-      init_notifications if notifications.empty?
-      prepare_notifications
-    end
-
     def emit
       init_notifications if notifications.empty?
       send_notifications
@@ -36,77 +27,76 @@ module Loco
 
     private
 
-      def init_notifications
-        recipients.each do |recipient|
-          @notifications << Notification.new(
-            obj: obj,
-            event: event,
-            recipient: recipient,
-            data: data
-          )
-        end
+    def init_notifications
+      recipients.each do |recipient|
+        @notifications << Notification.new(
+          obj: obj,
+          event: event,
+          recipient: recipient,
+          data: data
+        )
       end
+    end
 
-      def prepare_notifications
-        notifications.each(&:prepare)
-      end
+    def send_notifications
+      notifications.each do |notification|
+        notification.save!
+        next if notification.recipient_id.nil?
 
-      def send_notifications
-        notifications.each do |notification|
-          notification.save!
-          next if notification.recipient_id.nil?
-          shallow_recipient = notification.recipient shallow: true
-          next unless @conn_res_manager.connected? shallow_recipient
-          send_via_ws notification
-        end
-      end
+        shallow_recipient = notification.recipient shallow: true
+        next unless @conn_res_manager.connected? shallow_recipient
 
-      def send_via_ws notification
-        recipient = notification.recipient shallow: true
-        data = { loco: { notification: notification.compact } }
-        SenderJob.perform_later recipient, data
-        @sent_via_ws += 1
+        send_via_ws notification
       end
+    end
 
-      def notify_about_xhr_notifications?
-        @sent_via_ws < notifications.size
-      end
+    def send_via_ws(notification)
+      recipient = notification.recipient shallow: true
+      data = { loco: { notification: notification.compact } }
+      SenderJob.perform_later recipient, data
+      @sent_via_ws += 1
+    end
+
+    def notify_about_xhr_notifications?
+      @sent_via_ws < notifications.size
+    end
+
+    def notify_about_xhr_notifications
+      uuids = []
+      fetch_identifiers.each do |ident|
+        Loco::WsConnectionManager.new(ident).connected_uuids.each do |uuid|
+          next if uuids.include? uuid
 
-      def notify_about_xhr_notifications
-        uuids = []
-        fetch_identifiers.each do |ident|
-          Loco::WsConnectionManager.new(ident).connected_uuids.each do |uuid|
-            next if uuids.include? uuid
-            uuids << uuid
-            SenderJob.perform_later uuid, loco: { xhr_notifications: true }
-          end
+          uuids << uuid
+          SenderJob.perform_later uuid, loco: { xhr_notifications: true }
         end
       end
+    end
 
-      def set_sync_time_via_ws
-        sync_time = notifications.last.created_at.iso8601(6)
-        notifications.each do |notification|
-          recipient = notification.recipient shallow: true
-          SenderJob.perform_later recipient, loco: { sync_time: sync_time }
-        end
+    def set_sync_time_via_ws
+      sync_time = notifications.last.created_at.iso8601(6)
+      notifications.each do |notification|
+        recipient = notification.recipient shallow: true
+        SenderJob.perform_later recipient, loco: { sync_time: sync_time }
       end
+    end
 
-      def notifications_recipients
-        notifications.map { |n| n.recipient shallow: true }.map do |o|
-          o.instance_of?(Class) ? o.to_s.downcase : nil
-        end
+    def notifications_recipients
+      notifications.map { |n| n.recipient shallow: true }.map do |o|
+        o.instance_of?(Class) ? o.to_s.downcase : nil
       end
+    end
 
-      def fetch_identifiers
-        recipients = notifications_recipients
-        uniq_recipients = recipients.compact.uniq
-        Loco::WsConnectedResourcesManager.identifiers.find_all do |str|
-          if recipients.include? nil
-            true
-          else
-            uniq_recipients.include? str.split(':').first
-          end
+    def fetch_identifiers
+      recipients = notifications_recipients
+      uniq_recipients = recipients.compact.uniq
+      Loco::WsConnectedResourcesManager.identifiers.find_all do |str|
+        if recipients.include? nil
+          true
+        else
+          uniq_recipients.include? str.split(':').first
         end
       end
+    end
   end
 end

data/lib/loco/config.rb

@@ -2,28 +2,29 @@
 
 module Loco
   class Config
+    CONFIGURATION = Struct.new :silence_logger, :notifications_size, :app_name, :redis_instance
+
     cattr_accessor(:silence_logger) { false }
     cattr_accessor(:notifications_size) { 100 }
     cattr_accessor(:app_name) { 'loco' }
     cattr_accessor(:redis_instance) { nil }
 
-    def self.configure opts = {}
-      self.silence_logger = opts[:silence_logger] if opts[:silence_logger]
-      if opts[:notifications_size]
-        self.notifications_size = opts[:notifications_size]
-      end
-      self.app_name = opts[:app_name] if opts[:app_name]
-      configure_redis opts[:redis_instance]
+    def self.configure(config)
+      self.silence_logger = config.silence_logger if config.silence_logger
+      self.notifications_size = config.notifications_size if config.notifications_size
+      self.app_name = config.app_name if config.app_name
+      configure_redis config.redis_instance
     ensure
       true
     end
 
-    def self.configure_redis redis_instance
+    def self.configure_redis(redis_instance)
       if redis_instance
         self.redis_instance = redis_instance
         return
       end
       return unless defined? Redis
+
       Redis.current.get 'random_redis_key'
       self.redis_instance = Redis.current
     rescue Redis::CannotConnectError

data/lib/loco/emitter.rb

@@ -2,25 +2,26 @@
 
 module Loco
   module Emitter
-    def emit obj, event = nil, opts = {}
+    def emit(obj, event = nil, opts = {})
       Broadcaster.new(obj, event, opts).emit
     end
 
-    def emit_to recipient, data
+    def emit_to(recipient, data)
       Sender.new(recipient, data).emit
     end
 
-    def add_hub name, members = []
+    def add_hub(name, members = [])
       Hub.new(name, members).save
     end
 
-    def get_hub name
+    def get_hub(name)
       Hub.get name
     end
 
-    def del_hub name
+    def del_hub(name)
       hub = Hub.get name
       return false if hub.nil?
+
       hub.destroy
     end
   end

data/lib/loco/hub.rb

@@ -6,15 +6,16 @@ module Loco
 
     attr_reader :raw_members
 
-    def initialize name, members = []
+    def initialize(name, members = [])
       @name = "#{PREFIX}#{name}"
       @raw_members = members.map { |m| serialize m }
     end
 
     class << self
-      def get name
+      def get(name)
         hub = WsConnectionStorage.current.get "#{PREFIX}#{name}"
         return nil if hub.blank?
+
         new name, JSON.parse(hub)
       end
     end
@@ -23,17 +24,19 @@ module Loco
       @name.split(PREFIX).last
     end
 
-    def add_member member
+    def add_member(member)
       serialized = serialize member
       return raw_members if raw_members.include? serialized
+
       raw_members << serialized
       save
       raw_members
     end
 
-    def del_member member
+    def del_member(member)
       serialized = serialize member
       return nil unless raw_members.include? serialized
+
       raw_members.delete serialized
       save
       serialized
@@ -49,7 +52,7 @@ module Loco
       self
     end
 
-    def include? resource
+    def include?(resource)
       raw_members.include? serialize(resource)
     end
 
@@ -62,8 +65,8 @@ module Loco
 
     private
 
-      def serialize member
-        WsConnectionManager.new(member).identifier
-      end
+    def serialize(member)
+      WsConnectionManager.new(member).identifier
+    end
   end
 end

data/lib/loco/sender.rb

@@ -2,35 +2,43 @@
 
 module Loco
   class Sender
-    def initialize recipient, data = {}
+    def initialize(recipient, data = {})
       @recipients = [*recipient]
       @data = data
     end
 
     def emit
       uuids.each do |uuid|
-        NotificationCenterChannel.broadcast_to uuid, @data
+        NotificationCenterChannel.broadcast_to(uuid, payload)
       end
+      @data[:loco][:idempotency_key]
     end
 
     private
 
-      def uuids
-        @recipients.map do |r|
-          if r.is_a? String
-            r
-          elsif r.is_a? Hub
-            recipients_from_hub r
-          else
-            WsConnectionManager.new(r).connected_uuids
-          end
-        end.flatten.uniq
-      end
+    def uuids
+      @recipients.map do |r|
+        if r.is_a? String
+          r
+        elsif r.is_a? Hub
+          recipients_from_hub r
+        else
+          WsConnectionManager.new(r).connected_uuids
+        end
+      end.flatten.uniq
+    end
 
-      def recipients_from_hub hub
-        hub.raw_members.map do |m|
-          WsConnectionManager.new(m).connected_uuids
-        end.flatten.uniq
-      end
+    def recipients_from_hub(hub)
+      hub.raw_members.map do |m|
+        WsConnectionManager.new(m).connected_uuids
+      end.flatten.uniq
+    end
+
+    def payload
+      @data[:loco] ||= {}
+      @data[:loco][:idempotency_key] ||= @data[:idempotency_key] || SecureRandom.hex
+      @data.delete(:idempotency_key)
+      @data
+    end
   end
 end

data/lib/loco/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Loco
-  VERSION = '3.0.6'
+  VERSION = '4.0.0'
 end

data/lib/loco/ws_connected_resources_manager.rb

@@ -2,7 +2,7 @@
 
 module Loco
   class WsConnectedResourcesManager
-    def initialize resources
+    def initialize(resources)
       @resources = resources
       @connected_resources = nil
     end
@@ -11,19 +11,22 @@ module Loco
       def identifiers
         val = WsConnectionStorage.current.get key
         return [] if val.blank?
+
         JSON.parse val
       end
 
-      def add identifier
+      def add(identifier)
         ids = identifiers
         return if ids.include? identifier
+
         ids << identifier
         WsConnectionStorage.current.set key, ids.to_json
       end
 
-      def del identifier
+      def del(identifier)
         ids = identifiers
         return unless ids.include? identifier
+
         ids.delete identifier
         WsConnectionStorage.current.set key, ids.to_json
       end
@@ -35,14 +38,16 @@ module Loco
 
     def connected_resources
       return @connected_resources if @connected_resources
+
       @resources.each do |resource|
         next if WsConnectionManager.new(resource).connected_uuids.empty?
+
         add resource
       end
       @connected_resources || []
     end
 
-    def connected? resource
+    def connected?(resource)
       connected_resources.map do |res|
         WsConnectionManager.new(res).identifier
       end.include? WsConnectionManager.new(resource).identifier
@@ -50,10 +55,10 @@ module Loco
 
     private
 
-      def add resource
-        @connected_resources ||= []
-        @connected_resources << resource
-        @connected_resources.uniq!
-      end
+    def add(resource)
+      @connected_resources ||= []
+      @connected_resources << resource
+      @connected_resources.uniq!
+    end
   end
 end

data/lib/loco/ws_connection_manager.rb

@@ -2,16 +2,17 @@
 
 module Loco
   class WsConnectionManager
-    def initialize resource
+    def initialize(resource)
       @resource = resource
     end
 
     def identifier
       return @resource if @resource.is_a?(String)
+
       "#{@resource.class.name.downcase}:#{@resource.id}"
     end
 
-    def connected? uuid
+    def connected?(uuid)
       connected_uuids.include? uuid
     end
 
@@ -19,17 +20,17 @@ module Loco
       data.find_all { |_, v| v.is_a? String }.to_h.keys
     end
 
-    def add uuid
+    def add(uuid)
       update uuid
       check_connections
     end
 
-    def del uuid
+    def del(uuid)
       save(data.tap { |h| h.delete uuid })
       check_connections
     end
 
-    def update uuid
+    def update(uuid)
       save(data.tap { |h| h[uuid] = current_time })
     end
 
@@ -39,51 +40,54 @@ module Loco
 
     protected
 
-      def data
-        serialized_uuids = WsConnectionStorage.current.get identifier
-        return {} if serialized_uuids.blank?
-        JSON.parse serialized_uuids
-      end
+    def data
+      serialized_uuids = WsConnectionStorage.current.get identifier
+      return {} if serialized_uuids.blank?
 
-      def uuids
-        data.keys
-      end
+      JSON.parse serialized_uuids
+    end
 
-      def save hash
-        WsConnectionStorage.current.set identifier, hash.to_json
-      end
+    def uuids
+      data.keys
+    end
 
-      def check_connections
-        hash = data.to_a.map do |arr|
-          uuid, val = check_connection arr.first, arr.last
-          [uuid, val]
-        end.to_h.compact
-        save hash
-      end
+    def save(hash)
+      WsConnectionStorage.current.set identifier, hash.to_json
+    end
 
-      def check_connection uuid, val
-        case val
-        when String
-          val = check_connection_str uuid, val
-        when Hash
-          uuid, val = check_connection_hash uuid, val
-        end
+    def check_connections
+      hash = data.to_a.map do |arr|
+        uuid, val = check_connection arr.first, arr.last
         [uuid, val]
-      end
+      end.to_h.compact
+      save hash
+    end
 
-      def check_connection_str uuid, val
-        return val if Time.zone.parse(val) >= 3.minutes.ago
-        SenderJob.perform_later uuid, loco: { connection_check: true }
-        { 'check' => current_time }
+    def check_connection(uuid, val)
+      case val
+      when String
+        val = check_connection_str uuid, val
+      when Hash
+        uuid, val = check_connection_hash uuid, val
       end
+      [uuid, val]
+    end
 
-      def check_connection_hash uuid, val
-        return [uuid, val] if Time.zone.parse(val['check']) >= 5.seconds.ago
-        [nil, nil]
-      end
+    def check_connection_str(uuid, val)
+      return val if Time.zone.parse(val) >= 3.minutes.ago
 
-      def current_time
-        Time.current.iso8601(6)
-      end
+      SenderJob.perform_later uuid, loco: { connection_check: true }
+      { 'check' => current_time }
+    end
+
+    def check_connection_hash(uuid, val)
+      return [uuid, val] if Time.zone.parse(val['check']) >= 5.seconds.ago
+
+      [nil, nil]
+    end
+
+    def current_time
+      Time.current.iso8601(6)
+    end
   end
 end

data/lib/loco/ws_connection_storage.rb

@@ -16,7 +16,7 @@ module Loco
       @storage = Config.redis_instance || {}
     end
 
-    def get key
+    def get(key)
       case @storage
       when Hash
         storage[proper_key(key)]
@@ -25,7 +25,7 @@ module Loco
       end
     end
 
-    def set key, val
+    def set(key, val)
       case @storage
       when Hash
         storage[proper_key(key)] = val
@@ -34,7 +34,7 @@ module Loco
       end
     end
 
-    def del key
+    def del(key)
       case @storage
       when Hash
         storage.delete proper_key(key)
@@ -45,8 +45,8 @@ module Loco
 
     protected
 
-      def proper_key key
-        "#{Config.app_name}:#{key}"
-      end
+    def proper_key(key)
+      "#{Config.app_name}:#{key}"
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loco-rails
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 4.0.0
 platform: ruby
 authors:
 - Zbigniew Humeniuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-15 00:00:00.000000000 Z
+date: 2020-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: loco-rails-core
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.0
+- !ruby/object:Gem::Dependency
+  name: jbuilder
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.10.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.10.0
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -106,14 +120,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.5.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -184,6 +198,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.142'
+- !ruby/object:Gem::Dependency
+  name: source_maps_fixer
+  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: will_paginate
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.8
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.8
 description: Rails is awesome, but modern web needs Loco-motive.
 email:
 - hello@artofcode.co
@@ -245,7 +287,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Framework on top of Rails.