loco-rails 6.1.0 → 7.0.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b045cea0f5c6f123854c0a40b8953e869b18d0f97b31f332f96fd9b5d8c9d31
-  data.tar.gz: 9ee0e7159ede72b756f29a25adbd1982363f27f26f803f1d3f4d9c8cfbae2a3a
+  metadata.gz: 91fa43946b21c98653c94fb289209737014410626b912cd81a02d646a4fd1ca3
+  data.tar.gz: f05761f0f25b0a3a554e05c0530add2c1c7a17a0445a8934cf0da12772f13595
 SHA512:
-  metadata.gz: 236a3ddae5fcc7fb45f17bbfe8f0e48a8a9ac152cb83a4b53a4b9b5e4416a078ec7e4aaa65d5a31ac69a422574e63857787dac57f240f8c0397bfc42be25dfc4
-  data.tar.gz: 3857fd4ee3754ab803707ddeb86bc1cbaa7aead76f389202b43146ac11a76a71600a5e238a05dc1b80e6b67f7495374b20ed63ec45d653389b95126d22cc42b5
+  metadata.gz: bc352f8f3ca53406196967df78b1f8ef428beeb7b7a61c1005a0cb7ed99dba3ffc571431c6869676f688c2d4e069a8d7ef5faa2f7a12d579e8d500cb361ed149
+  data.tar.gz: 6ee7da804147b2ac32cb8ef11558b604ea2a6822fd946f8a91b242d113f55a0ab7b7070956f2e54851f0159a512e86c9474dea1d6245bbc728a2d10e53d265cb

data/app/channels/loco/notification_center_channel.rb

@@ -33,7 +33,7 @@ module Loco
     protected
 
     def update_connections
-      PermissionsPresenter.indexed(loco_permissions, except: :uuid).each do |_, resource|
+      PermissionsPresenter.indexed(loco_permissions, except: :uuid).each_value do |resource|
         WsConnectionManager.new(resource).update(@uuid)
       end
     end

data/app/controllers/loco/notification_center_controller.rb

@@ -22,7 +22,7 @@ module Loco
         return
       end
       fetcher = Notification::Fetcher.new({ synced_at: params[:synced_at],
-                                            permissions: permissions,
+                                            permissions:,
                                             recipient_token: params[:token] })
       render json: [fetcher.formatted_notifications, fetcher.next_sync_time.iso8601(6)]
     end

data/app/models/loco/notification.rb

@@ -7,7 +7,7 @@ module Loco
 
     attr_reader :obj
 
-    serialize :data, JSON
+    serialize :data, coder: JSON if ActiveRecord::Base.connection.adapter_name != 'PostgreSQL'
 
     validates :obj_class, presence: true
     validates :event, presence: true

data/db/migrate/20150927133812_create_loco_notifications.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-class CreateLocoNotifications < ActiveRecord::Migration[5.0]
+class CreateLocoNotifications < ActiveRecord::Migration[6.1]
   def change
-    create_table :loco_notifications do |t|
+    create_table :loco_notifications, id: false do |t|
       t.string :obj_class
-      t.integer :obj_id
+      t.bigint :obj_id
       t.string :event
-      t.string :data
+      t.column :data, (ActiveRecord::Base.connection.adapter_name == 'PostgreSQL' ? :jsonb : :text)
       t.string :recipient_class
-      t.integer :recipient_id
+      t.bigint :recipient_id
       t.string :recipient_token
 
       t.timestamps null: false, limit: 6

data/db/migrate/20240211210452_add_indexes_to_loco_notifications.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class AddIndexesToLocoNotifications < ActiveRecord::Migration[6.1]
+  def change
+    add_index :loco_notifications, %i[created_at recipient_class recipient_id],
+              name: 'index_loco_notifications_on_created_at_and_recipient'
+
+    add_index :loco_notifications, %i[created_at recipient_token],
+              name: 'index_loco_notifications_on_created_at_and_recipient_token'
+  end
+end

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

@@ -7,7 +7,6 @@ module Loco
     def install
       generate 'loco:initializer'
       generate 'loco:file_injector'
-      generate 'loco:core:file_injector'
       generate 'loco:notification_center'
       rake 'loco:install:migrations'
     end

data/lib/loco/broadcaster.rb

@@ -22,9 +22,9 @@ module Loco
       def send_notifications(obj, event, recipients, payload)
         recipients.each do |recipient|
           notification = Notification.create!(
-            obj: obj,
-            event: event,
-            recipient: recipient,
+            obj:,
+            event:,
+            recipient:,
             data: payload
           )
           sync_time = notification.created_at.iso8601(6)
@@ -43,10 +43,10 @@ module Loco
       def send_notification(recipient, notification, sync_time)
         if notification.recipient_id
           Sender.(recipient, loco: { notification: notification.compact })
-          Sender.(recipient, loco: { sync_time: sync_time })
+          Sender.(recipient, loco: { sync_time: })
         else
           SenderJob.perform_later(recipient, loco: { notification: notification.compact })
-          SenderJob.perform_later(recipient, loco: { sync_time: sync_time })
+          SenderJob.perform_later(recipient, loco: { sync_time: })
         end
       end
     end

data/lib/loco/config.rb

@@ -13,22 +13,9 @@ module Loco
       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
+      self.redis_instance = config.redis_instance
     ensure
       true
     end
-
-    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
-      self.redis_instance = nil
-    end
   end
 end

data/lib/loco/hub.rb

@@ -58,7 +58,7 @@ module Loco
     def members
       raw_members.map do |serialized|
         klass, id = serialized.split(':')
-        klass.classify.constantize.find_by(id: id)
+        klass.classify.constantize.find_by(id:)
       end
     end
   end

data/lib/loco/permissions_presenter.rb

@@ -9,7 +9,7 @@ module Loco
         o.class.name.downcase.to_sym
       end
       if opts[:except] == :uuid
-        h.reject { |k, _| k == :string }
+        h.except(:string)
       else
         h
       end

data/lib/loco/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Loco
-  VERSION = '6.1.0'
+  VERSION = '7.0.0.pre'
 end

data/lib/loco/ws_connection_storage.rb

@@ -59,8 +59,8 @@ module Loco
       end
     end
 
-    def scan_hash(key, &block)
-      storage.hscan_each(proper_key("h:#{key}"), &block)
+    def scan_hash(key, &)
+      storage.hscan_each(proper_key("h:#{key}"), &)
     end
 
     def hlen(key)

data/lib/loco-rails.rb

@@ -1,12 +1,9 @@
 # frozen_string_literal: true
 
-require 'loco-rails-core'
-
 require 'loco/broadcaster'
 require 'loco/config'
 require 'loco/emitter'
 require 'loco/rails/engine'
-require 'loco/helpers'
 require 'loco/hub'
 require 'loco/permissions_presenter'
 require 'loco/sender'

metadata

@@ -1,253 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: loco-rails
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 7.0.0.pre
 platform: ruby
 authors:
 - Zbigniew Humeniuk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-04 00:00:00.000000000 Z
+date: 2024-02-11 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: loco-rails-core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: bcrypt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.1.16
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.1.16
-- !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.36.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.36.0
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.1
-- !ruby/object:Gem::Dependency
-  name: jbuilder
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.11.5
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.11.5
-- !ruby/object:Gem::Dependency
-  name: listen
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.7.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.7.1
-- !ruby/object:Gem::Dependency
-  name: mysql2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.3
-- !ruby/object:Gem::Dependency
-  name: puma
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.6.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.6.2
-- !ruby/object:Gem::Dependency
-  name: redis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.5.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.5.1
-- !ruby/object:Gem::Dependency
-  name: rspec-expectations
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.10.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.10.2
-- !ruby/object:Gem::Dependency
-  name: rspec-mocks
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.10.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.10.2
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  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: rubocop-rails
-  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: selenium-webdriver
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.1.0
-- !ruby/object:Gem::Dependency
-  name: sprockets-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.4.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.4.2
-- !ruby/object:Gem::Dependency
-  name: will_paginate
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.3.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.3.1
+        version: '6.1'
 description: Rails is awesome, but modern web needs Loco-motive.
 email:
 - hello@artofcode.co
@@ -265,6 +41,7 @@ files:
 - app/services/loco/notification/fetcher.rb
 - config/routes.rb
 - db/migrate/20150927133812_create_loco_notifications.rb
+- db/migrate/20240211210452_add_indexes_to_loco_notifications.rb
 - lib/generators/loco/file_injector/USAGE
 - lib/generators/loco/file_injector/file_injector_generator.rb
 - lib/generators/loco/file_injector/templates/application_controller.rb
@@ -281,7 +58,6 @@ files:
 - lib/loco/broadcaster.rb
 - lib/loco/config.rb
 - lib/loco/emitter.rb
-- lib/loco/helpers.rb
 - lib/loco/hub.rb
 - lib/loco/permissions_presenter.rb
 - lib/loco/rails/engine.rb
@@ -305,14 +81,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.6
 signing_key:
 specification_version: 4
 summary: Framework on top of Rails.

data/lib/loco/helpers.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-module Loco
-  module Helpers
-    include Loco::Core::Helpers
-  end
-end