wisper_plus 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59894c1fa699b69e342ac88ad598630a093c2c9e99e33fd266ab85a6afb5790b
-  data.tar.gz: 4e7644aa0f78b6fdfeb5fbaa3a1f1dfb9dc1a19ecd2a3c77ddffba1cc253e643
+  metadata.gz: 8b983012a8318f5055600e1ec96302dcb8eb1b24563d5b0ad6650d686dfebd53
+  data.tar.gz: 9a5bbd463fec537212d446dda329d198d451eb7f5bb5726ef6c77f40a9c86986
 SHA512:
-  metadata.gz: 4a71b7705fcf7d5a96c653f2d18ae2f2749ce9ab363bb28f68ecb363fa9f68e732fa2600b33257ea309a71231c3924ed3507e696e221b2644f598bafc16af0dc
-  data.tar.gz: 15a7688dad794bd8423f5b89b5c6f598098a1f49d8e4d8c9b764a2d86ce47a63a13be4f8437016a889513183906f0031cc410067b0f80c9ab42b8b88886288d2
+  metadata.gz: 76026e2a0de474cca4e9de38a473b819365025214f44d36f1894e9edc1f3db73cdff14881facf14270bbe89717f95d495b30807d894172b3e0ddd04fa24ead20
+  data.tar.gz: a7483b72f8a6c451bdad41a4f5931109e88c5ec4e7f0d320b7a787f0652cb0c4db90fa45f124fb1a06ef56e4d2ac6377ddff049e0304c41ffcba8789ef8951cf

data/CHANGELOG.md

@@ -1,2 +1,9 @@
-# 0.1.1
+# Changelog
+
+## 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/lib/wisper_plus/railtie.rb

@@ -2,32 +2,74 @@ require 'rails'
 
 class WisperPlus::Railtie < Rails::Railtie
 
+  def self.subscribe(model_klass, subscriber_klass)
+    model_class = model_klass
+    if model_class != 'Global'
+      begin
+        model_class = model_class.constantize
+        if !model_class.ancestors.include?(ApplicationRecord)
+          # puts "🔸 #{model_class} is not an ActiveRecord model".yellow
+          return
+        end
+        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
+        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/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)
-        begin
-          notifier_klass = "#{klass}Subscriber".constantize
-          klass.subscribe(notifier_klass.new, async: false)
-          if Rails.env.development?
-            puts "🔹 #{klass.to_s.magenta} #{'subscriber'.blue}"
-          end
-          if !klass.ancestors.include?(Wisper::Publisher)
-            puts "🔸 #{klass} is not including Wisper::ActiveRecord::Publisher".yellow
+      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
-        rescue NameError
-          # ignore
         end
       end
     end
-
   end
 
+
 end

data/lib/wisper_plus/version.rb

@@ -1,3 +1,3 @@
 module WisperPlus
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/wisper_plus.gemspec

@@ -30,7 +30,7 @@ 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 "bundler", ">= 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
 
   spec.add_runtime_dependency 'activesupport', '>= 3', '< 6'

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: wisper_plus
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Ben Sharpe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-14 00:00:00.000000000 Z
+date: 2019-01-25 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'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency