wisper_plus 0.1.1 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1516979421843228313201c9dc0139573d8484cac78e90e995134d9d8e2b58c1
-  data.tar.gz: 8635d9e038c81bd9e7f58ca3de14785408d08c82ec3f3e6b866936d92053941b
+  metadata.gz: baabb826e9732fbf4c23623dc7792153c2f44eb84caf4a4c12899154983c83ad
+  data.tar.gz: c3687921c30c5a1df7eed1bf809382b4bc5fcd2820edde29aeceab8f31395daf
 SHA512:
-  metadata.gz: 24e7a57f3a09517ef4bfb0975b053354c16cb35a163f2ac4a707e6aebe6c30724959e1a43de945c1c116e62dc5f448beb1307d1f65df09d778486c570c848e03
-  data.tar.gz: 7cc1da603314a6fbd39bd73f4f60cf3ae1e6277acb32c5683194d28ddd9650008e7b6b971cc945d8b86723ccb78fe15dbfdf35d0be2775292df3b80431bc91cf
+  metadata.gz: 8c0f7026ee5aee90a9197f2086152e3c588b706c7f732e1a54b58d3a5672f478a7564fca9ef7acf0dc9cbfc11a3628fd66338b553acb92527dae868442390de7
+  data.tar.gz: 3a7580bcc5d673590485722c0c90062348f0fa52eef60a6b842499d7219f0efdea64d9989af4616f5f1394fccbed0eb4a5d3fa3a1b036663990f953f593adead

data/CHANGELOG.md

@@ -1,2 +1,12 @@
-# 0.1.1
+# Changelog
+
+## 0.1.5
+- allow Rails 6
+
+## 0.1.4
+- allow multiple subscribers to subscribe to a model
+- fix global subscriber
+- better error reporting
+
+## 0.1.1
 - make publish/broadcast a public method

data/Gemfile.lock

@@ -0,0 +1,36 @@
+PATH
+  remote: .
+  specs:
+    wisper_plus (0.1.5)
+      activesupport (>= 6.0.3.1)
+      wisper (>= 1.6, < 3.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (6.1.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    concurrent-ruby (1.1.9)
+    i18n (1.8.10)
+      concurrent-ruby (~> 1.0)
+    minitest (5.14.4)
+    rake (13.0.3)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    wisper (2.0.1)
+    zeitwerk (2.4.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (>= 1.16, < 3.0)
+  rake (>= 12.3.3)
+  wisper_plus!
+
+BUNDLED WITH
+   2.2.15

data/lib/wisper_plus.rb

@@ -34,7 +34,7 @@ module Wisper
         # pass the set of changes for background jobs to know what changed
         # see https://github.com/krisleech/wisper-activerecord/issues/17
         def broadcast_update
-          broadcast(:after_update, self, previous_changes.with_indifferent_access) if previous_changes.any?
+          broadcast(:after_update, self) if self.saved_changes?
         end
 
         # broadcast MODEL_destroyed to subscribed listeners
@@ -72,7 +72,6 @@ module Wisper
                 e
               end
             end
-            ap event
             listener&.public_send(event, *args)
           end
         end
@@ -85,9 +84,9 @@ module Wisper
         end
       end
     end
+    Wisper::ActiveJobBroadcaster.register
   end
 
-  Wisper::ActiveJobBroadcaster.register
 end
 
 

data/lib/wisper_plus/railtie.rb

@@ -2,28 +2,74 @@ require 'rails'
 
 class WisperPlus::Railtie < Rails::Railtie
 
-  config.after_initialize do
-
-    # Link any Models to their <Model>Subscriber class
-    Dir.glob(Rails.root.join('app/models/**/*.rb').to_s) do |filename|
-      next if filename.index('/concerns/')
-      filename = filename.remove(Rails.root.join('app/models/').to_s)[0..-4]
-      klass = filename.camelize.constantize
-      next unless klass.ancestors.include?(ApplicationRecord)
+  def self.subscribe(model_klass, subscriber_klass)
+    model_class = model_klass
+    if model_class != 'Global'
       begin
-        notifier_klass = "#{klass}Subscriber".constantize
-        klass.subscribe(notifier_klass.new, async: false)
-        if Rails.env.development?
-          puts "🔹 #{klass.to_s.magenta} #{'subscriber'.blue}"
+        model_class = model_class.constantize
+        if !model_class.ancestors.include?(ApplicationRecord)
+          # puts "🔸 #{model_class} is not an ActiveRecord model".yellow
+          return
         end
-        if !klass.ancestors.include?(Wisper::Publisher)
-          puts "🔸 #{klass} is not including Wisper::ActiveRecord::Publisher".yellow
+        if !model_class.ancestors.include?(Wisper::Publisher)
+          puts "🔸 #{model_class} is not including Wisper::ActiveRecord::Publisher. Cannot Subscribe #{subscriber_klass.magenta}.".yellow
+          return
         end
       rescue NameError
-        # ignore
+        model_class = model_class.split("::")
+        model_class.pop
+        if model_class.size.positive?
+          model_class = model_class.join('::')
+          retry
+        else
+          puts "🔸 #{model_klass} not found"
+          return
+        end
+      end
+    end
+
+    begin
+      subscriber_klass = subscriber_klass.constantize
+    rescue NameError
+      puts "🔸 #{subscriber_klass} not found"
+    end
+
+    begin
+      if model_class != 'Global'
+        model_class.subscribe(subscriber_klass.new, async: false)
+      else
+        Wisper.subscribe(subscriber_klass.new)
       end
+    rescue NoMethodError
+      puts "🔸 #{model_class}.subscribe() not found"
     end
 
+    if Rails.env.development?
+      puts "🔹 #{subscriber_klass.to_s.magenta} => #{model_class.to_s.blue}"
+    end
   end
 
+  config.to_prepare do
+    Wisper.clear if Rails.env.development?
+
+    # AUTOLINK models to subscribers if DB exists
+    if (::ActiveRecord::Base.connection rescue false)
+      # Link any Models to their <Model>Subscriber class
+      Dir.glob(Rails.root.join('app/subscribers/**/*.rb').to_s) do |filename|
+        filename = filename.remove(Rails.root.join('app/subscribers/').to_s)[0..-4]
+        subscriber_klass = filename.classify
+        model_klass = subscriber_klass.chomp("Subscriber")
+        WisperPlus::Railtie.subscribe(model_klass, subscriber_klass)
+
+        subscribers_dir = Rails.root.join('app','subscribers',filename)
+        if subscribers_dir.directory?
+          subscribers_dir.each_child do |fpath|
+            ap fpath
+          end
+        end
+      end
+    end
+  end
+
+
 end

data/lib/wisper_plus/version.rb

@@ -1,3 +1,3 @@
 module WisperPlus
-  VERSION = "0.1.1"
+  VERSION = "0.1.6"
 end

data/wisper_plus.gemspec

@@ -30,10 +30,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", ">= 1.16", '< 3.0'
+  spec.add_development_dependency "rake", ">= 12.3.3"
 
-  spec.add_runtime_dependency 'activesupport', '>= 3', '< 6'
+  spec.add_runtime_dependency 'activesupport', ">= 6.0.3.1"
 
   spec.add_dependency 'wisper', '>= 1.6', '< 3.0'
 end

metadata

@@ -1,63 +1,63 @@
 --- !ruby/object:Gem::Specification
 name: wisper_plus
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.6
 platform: ruby
 authors:
 - Ben Sharpe
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-08-17 00:00:00.000000000 Z
+date: 2021-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
+        version: 6.0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
+        version: 6.0.3.1
 - !ruby/object:Gem::Dependency
   name: wisper
   requirement: !ruby/object:Gem::Requirement
@@ -91,6 +91,7 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -104,7 +105,7 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -119,9 +120,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Handy additions to Wisper
 test_files: []