concerto_template_scheduling 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1671432ba95646459fd39f3cd5560d32997e33c
-  data.tar.gz: 73973e1c52d452cd42afd07be0c61ed11987188d
+  metadata.gz: f5c7c04f07217590b080132754d21fe5cafeac4a
+  data.tar.gz: 0deb0cda5c77652123da91d07fefad3ea3b48ff0
 SHA512:
-  metadata.gz: 0f149b6f566baa2caa01da99013f38137d69e7a23325e46b3a2b9a95a14ef22e3a124ef7ffe87375a91f5108980807f91126593979c913251198ae015f276d61
-  data.tar.gz: 2be7e85debbf625d1c7ab4206574d06e704ab0659d662ec7df270c09b16cfbf800d122148ff4df4536e1fb2841acc2942590f344a673702532579c7619045c9e
+  metadata.gz: 8c4de17db8e34ee8e5812e576baa84a61f773f777d36a44b7d1fcfc6533a3d4876382219f551393f5007049d2a576c495247c95dc929e00ba5d6fca6b9a55e0e
+  data.tar.gz: d44439625bd89b78004a8ebcc54ea064cd0a9a446fc49f8254d6270f5aa16f2a1b5ca7fa2c122ba75decb32ca3829262c834287d5df3608b327b01c137381b62

data/README.md

@@ -19,6 +19,3 @@ rails generate concerto_template_scheduling
 
 ## Security
 If a user can update a screen, they have the ability to manage the scheduled templates for that screen.
-
-## Requirements
-`start_time` and `end_time` setters (in the model) don't work well with ruby 1.8.7.

data/lib/concerto_template_scheduling/engine.rb

@@ -37,14 +37,22 @@ module ConcertoTemplateScheduling
         add_view_hook "TemplatesController", :template_details, :partial => "concerto_template_scheduling/templates/in_use_by"
 
         # influence which template is the effective template for a screen
+        # prepend these so that the EMS plugin can override them
 
-        add_controller_hook "Screen", :frontend_display, :before do
+        add_controller_hook "Screen", :frontend_display, [:before, :prepend => true] do
           # sets the template to the "effective" template
           schedules = Schedule.active.where(:screen_id => self.id)
           schedules.reject! {|s| !s.is_effective? }
           self.template = schedules.first.template if !schedules.empty?
         end
 
+        add_controller_hook "Frontend::ContentsController", :index, [:after, :prepend => true]  do
+          # sets the template to the "effective" template
+          schedules = Schedule.active.where(:screen_id => @screen.id)
+          schedules.reject! {|s| !s.is_effective? }
+          @screen.template = schedules.first.template if !schedules.empty?
+        end
+
         # delete schedules when a screen is deleted
 
         add_controller_hook "ScreensController", :destroy, :after do

data/lib/concerto_template_scheduling/version.rb

@@ -1,3 +1,3 @@
 module ConcertoTemplateScheduling
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: concerto_template_scheduling
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Marvin Frederickson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-14 00:00:00.000000000 Z
+date: 2014-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -141,7 +141,7 @@ files:
 - test/test_helper.rb
 - test/unit/concerto_template_scheduling/schedule_test.rb
 - test/unit/helpers/concerto_template_scheduling/schedules_helper_test.rb
-homepage: ''
+homepage: https://github.com/concerto/concerto_template_scheduling
 licenses: []
 metadata: {}
 post_install_message: 
@@ -160,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Scheduling of Templates for Screens