federal_offense 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72a753592cc61bfb16aa40f12c821def2d9a5b19d1420d6656d023f50528765a
-  data.tar.gz: 31da2e309fc35f087665fbc3e347b26a1434f9baf157c955cb961f7f904ea969
+  metadata.gz: c8f2aad73ac12c17667d27c4e8ab4bed3a05404d1ce27124bdce05dd3f7b9460
+  data.tar.gz: 6826764368d5158c1148ebb25ab4afb819c47260273e8891297cfd49a1ecc54d
 SHA512:
-  metadata.gz: 7ad12b89234faad79ecf3858b3faef262cca1b3ff571404a6d4db3e87335010589d1d48f53d8790d4cf5afea4dae8f162e2fdeaf3713616417d80558f5c8ba42
-  data.tar.gz: 1340009c960bd94aee253855c7d7b5d3e972b8ccbcdc9d40f39295a24ffd2077559bb5d9df92c44894313133c51a58e5aa3be4ba509031f4c5a700150ebdbb2e
+  metadata.gz: 1b9230af21379c71f1f967b08ab6f025eb80e5461ef403d937e4be55266ae75464f052655d8786e7539b4b049601ab750cafd78a722b6a47eed35a0dba6f6460
+  data.tar.gz: 7c67a2bf94aeb01807cb7e639dde8f4fe0e193cae31a4082b60add146175939fd3b033bec09cddeead8682fc26ac871341cae9142a736a377367830686fc7905

data/app/assets/javascripts/federal_offense/cable.js

@@ -1,7 +1,7 @@
 //= require ./vendor/action_cable
 
 const consumer = ActionCable.createConsumer()
-consumer.subscriptions.create("FederalOffense::InboxChannel", {
+consumer.subscriptions.create("FederalOffense::ActionCable::InboxChannel", {
   connected: () => {
     /* NOOP */
   },

data/lib/federal_offense/action_cable.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module FederalOffense
+  module ActionCable
+    def self.broadcast!(message: {reload: true})
+      InboxChannel.broadcast!(message: message)
+    end
+
+    class Connection < ::ActionCable::Connection::Base
+    end
+
+    class InboxChannel < ::ActionCable::Channel::Base
+      def self.broadcast!(message: {reload: true})
+        FederalOffense::Engine.cable_server.broadcast(name, message)
+      end
+
+      def subscribed
+        stream_from self.class.name
+      end
+
+      def unsubscribed
+      end
+    end
+  end
+end

data/lib/federal_offense/engine.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require_dependency "federal_offense/action_cable" if defined? ActionCable
 require_dependency "federal_offense/interceptor"
 
 module FederalOffense
@@ -10,9 +11,9 @@ module FederalOffense
       attr_accessor :cable_server
 
       def cable_config
-        @cable_config ||= ActionCable::Server::Configuration.new.tap do |config|
+        @cable_config ||= ::ActionCable::Server::Configuration.new.tap do |config|
           config.logger = Rails.logger
-          config.connection_class = -> { FederalOffense::ApplicationCable::Connection }
+          config.connection_class = -> { FederalOffense::ActionCable::Connection }
           config.mount_path = "cable"
         end
       end
@@ -34,24 +35,30 @@ module FederalOffense
 
     # Enable ActionCable connections in the inbox for auto-reload
     initializer "action_cable_connection" do |app|
-      # Find cable configs
-      federal_offense_config_path = Rails.root.join("config", "federal_offense_cable.yml")
-      app_config_path = Rails.root.join("config", "cable.yml")
-
-      # Determine which config we're going to use
-      config = if File.exist?(federal_offense_config_path)
-        app.config_for(federal_offense_config_path).with_indifferent_access
-      elsif File.exist?(app_config_path)
-        app.config_for(app_config_path).with_indifferent_access
+      if defined? ::ActionCable
+        # Activate ActionCable
+        FederalOffense.action_cable = true
+
+        # Find cable configs
+        federal_offense_config_path = Rails.root.join("config", "federal_offense_cable.yml")
+        app_config_path = Rails.root.join("config", "cable.yml")
+
+        # Determine which config we're going to use
+        config = if File.exist?(federal_offense_config_path)
+          app.config_for(federal_offense_config_path).with_indifferent_access
+        elsif File.exist?(app_config_path)
+          app.config_for(app_config_path).with_indifferent_access
+        else
+          # Default to an async cable cause whatever
+          {adapter: "async"}
+        end
+
+        # Assign the values to the cable config and create a server
+        self.class.cable_config.cable = config
+        self.class.cable_server = ::ActionCable::Server::Base.new(config: self.class.cable_config)
       else
-        # Default to an async cable cause whatever
-        {adapter: "async"}
+        FederalOffense.action_cable = false
       end
-
-      # Assign the values to the cable config and create a server
-      self.class.cable_config.cable = config
-      self.class.cable_server = ActionCable::Server::Base.new(config: self.class.cable_config)
-      FederalOffense.action_cable = true
     end
   end
 end

data/lib/federal_offense/interceptor.rb

@@ -4,7 +4,7 @@ module FederalOffense
   class Interceptor
     def self.delivering_email(message)
       FederalOffense::Message.create(message)
-      FederalOffense::InboxChannel.broadcast!
+      FederalOffense::ActionCable.broadcast! if FederalOffense.action_cable
     end
   end
 end

data/lib/federal_offense/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FederalOffense
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: federal_offense
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Flip Sasser
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-28 00:00:00.000000000 Z
+date: 2020-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -238,9 +238,6 @@ files:
 - app/assets/stylesheets/federal_offense/components/nav.css
 - app/assets/stylesheets/federal_offense/components/section.css
 - app/assets/stylesheets/federal_offense/components/table.css
-- app/channels/federal_offense/application_cable/channel.rb
-- app/channels/federal_offense/application_cable/connection.rb
-- app/channels/federal_offense/inbox_channel.rb
 - app/controllers/federal_offense/application_controller.rb
 - app/controllers/federal_offense/messages_controller.rb
 - app/helpers/federal_offense/application_helper.rb
@@ -251,6 +248,7 @@ files:
 - config/locales/en.yml
 - config/routes.rb
 - lib/federal_offense.rb
+- lib/federal_offense/action_cable.rb
 - lib/federal_offense/engine.rb
 - lib/federal_offense/interceptor.rb
 - lib/federal_offense/version.rb

data/app/channels/federal_offense/application_cable/channel.rb

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-module FederalOffense
-  module ApplicationCable
-    class Channel < ActionCable::Channel::Base
-    end
-  end
-end

data/app/channels/federal_offense/application_cable/connection.rb

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-module FederalOffense
-  module ApplicationCable
-    class Connection < ActionCable::Connection::Base
-    end
-  end
-end

data/app/channels/federal_offense/inbox_channel.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-module FederalOffense
-  class InboxChannel < FederalOffense::ApplicationCable::Channel
-    def self.broadcast!(message: {reload: true})
-      FederalOffense::Engine.cable_server.broadcast(name, message)
-    end
-
-    def subscribed
-      stream_from self.class.name
-    end
-
-    def unsubscribed
-    end
-  end
-end