concerto_emergency 0.8 → 0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae5b167fe1838320f01a54deb219434671fd73a5
-  data.tar.gz: 05ca46587948ef1b4d354706a75998d057aada44
+  metadata.gz: bbe8cb5f8f6eb97b1449435c8ae086f10a47e9fe
+  data.tar.gz: bd60f314f7a1da48eaed20333fc56744b71038ec
 SHA512:
-  metadata.gz: e77365dc568c0e369e8e18f9d97f78180bc5a6cdc2f2897b73e1b3b19b9ba372b2442b1e6f5711d1db8b43d2d6e653bc14cce7d9a7c94e6ffacb610fb1a52748
-  data.tar.gz: c72bb0080e297eca9b7e99b41dd58000b3934b9bcb31fb90a6b415180e345effee7cf2585ab7fa61d544357993cfe40d7e95dce0fdbb7004ef287bdd28d35a9c
+  metadata.gz: 1823eef4014e539816c927c730341a8c7d9dd05e4f97dec0332dada6cf041af5434d329466cfbb5897e808c507511b75cd935172e7ef413b7b22dc53810826d4
+  data.tar.gz: 66996517877481d64bd810f38ea9c27ddcec2d9154b53f46dd8d22d10a0eb1bf7d6ad6969561910b505a0e30244e8923a4676e477513305f51a8becbd7c1dfd9

data/README.md

@@ -1,12 +1,10 @@
 Concerto Emergency 
 ==================
 
-This plugin provides [Concerto Digital Signage](https://github.com/concerto/concerto) with emergency alert capabilities. When an emergency alert is submitted manually or an emergency alert is detected on an RSS feed, the plugin will change the effective template and display the alert. 
+This plugin provides [Concerto Digital Signage](https://github.com/concerto/concerto) with emergency alert capabilities. When content is submitted manually (or via an RSS feed) to a designated emergency alert feed, the plugin will change the effective template and display the emergency alert feed content. 
 
 Instructions
 ------------
-1. Clone the repository, navigate to the plugins page and add a new plugin using the filesystem path to concerto-emergency.
+Clone the repository, navigate to the plugins page and add a new plugin using the filesystem path to concerto-emergency and then run ```bundle install```.  Or choose to add a new plugin within the concerto ui, choose Rubygems as the source and enter _concerto_emergency_ as the plugin name.
 
-2. Run ```bundle install```
-
-3. Plugin settings can be found under Admin > Settings > Emergency Alerts. The emergency template will replace the current template when emergency alerts are detected in the emergency feed. 
+Plugin settings can be found under Admin > Settings > Emergency Alerts. The emergency template will replace the current template when any content is detected on the designated feed.  This plugin automatically creates a new feed called "Emergency Alerts" the first time it is loaded.

data/lib/concerto_emergency/engine.rb

@@ -8,13 +8,33 @@ module ConcertoEmergency
     def plugin_info(plugin_info_class)
       @plugin_info ||= plugin_info_class.new do
 
+        # if we have not yet set up the configuration for this plugin...
+        unless ConcertoConfig.find_by(key: 'emergency_feed').present?
+          # set default emergency feed to "Emergency Alerts" so we need to make sure it exists here
+          unless Feed.find_by(name: "Emergency Alerts").present?
+
+            # set up the content types allowed on the new emergency feed to be all inclusive initially
+            content_types = {}
+            Feed.all.each {|f| content_types.merge! f.content_types }
+
+            Feed.create({
+              name: "Emergency Alerts",
+              description: "Content on this feed is immediately displayed on all screens",
+              is_viewable: true,
+              is_submittable: true,
+              content_types: content_types,
+              group: Group.first
+              })
+          end
+        end
+
         # Add configuration options under Concerto Admin Settings
         add_config("emergency_template", "Default Template",
           :value_type => "string",
           :category => "Emergency Alerts",
           :description => "Template used to display emergency alerts")
 
-        add_config("emergency_feed", "Concerto",
+        add_config("emergency_feed", "Emergency Alerts",
           :value_type => "string",
           :category => "Emergency Alerts",
           :description => "Feed monitored for emergency alert content")
@@ -27,14 +47,15 @@ module ConcertoEmergency
         add_controller_hook "Screen", :frontend_display, :before do
 
           emergency_feed = Feed.find_by_name(ConcertoConfig[:emergency_feed])
-          emergency_active = emergency_feed.submissions.approved.active.includes(:content).where("kind_id != 4").present?
-
           # Check for emergency content 
-          if not emergency_feed.nil? and emergency_active
-            # swap template to emergency template if emergency content is present
-            emergency_template = Template.find_by_name(ConcertoConfig[:emergency_template])
-            if not emergency_template.nil?
-              self.template = emergency_template
+          if not emergency_feed.nil?
+            emergency_active = emergency_feed.submissions.approved.active.includes(:content).where("kind_id != 4").present?
+            if emergency_active
+              # swap template to emergency template if emergency content is present
+              emergency_template = Template.find_by_name(ConcertoConfig[:emergency_template])
+              if not emergency_template.nil?
+                self.template = emergency_template
+              end
             end
           end
 
@@ -44,17 +65,14 @@ module ConcertoEmergency
         add_controller_hook "Frontend::ContentsController", :index, :after do
 
           emergency_feed = Feed.find_by_name(ConcertoConfig[:emergency_feed])
-          emergency_active = emergency_feed.submissions.approved.active.includes(:content).where("kind_id != 4").present?
-          
           if not emergency_feed.nil?
+            emergency_active = emergency_feed.submissions.approved.active.includes(:content).where("kind_id != 4").present?
             emergency_submissions = emergency_feed.submissions.approved.active.includes(:content).where("kind_id = ?", @field.kind_id)
             emergency_contents = Array.new()
             emergency_submissions.each { |submission| emergency_contents << Content.find(submission.content_id) }
         
             if emergency_active
-
-              # Change template identifier so the screen knows a template 
-              #  is used for emergency alerts
+              # swap template to emergency template if emergency content is present
               emergency_template = Template.find_by_name(ConcertoConfig[:emergency_template])
               if not emergency_template.nil?
                 @screen.template = emergency_template

data/lib/concerto_emergency/version.rb

@@ -1,3 +1,3 @@
 module ConcertoEmergency
-  VERSION = "0.8"
+  VERSION = "0.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: concerto_emergency
 version: !ruby/object:Gem::Version
-  version: '0.8'
+  version: '0.9'
 platform: ruby
 authors:
 - Concerto Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-15 00:00:00.000000000 Z
+date: 2015-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails