concerto_hardware 0.6 → 0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 186d33539240543220c3e8bf64bb23faa40d8012
-  data.tar.gz: 64915da3b071bd54ace66a802a73dc1e529f7106
+  metadata.gz: f1de2ff162fbfe44a96e2e7a3a186884558c818d
+  data.tar.gz: 32d526c912f7106a368aa00f68d10e6bb2bcd5a7
 SHA512:
-  metadata.gz: e3204c8e5869116dfb1e6d30adb64ec67bf5a284ffa3fcc05d4f0f1789b1f935003472eabdcfcdcc85918e74231f906dbd511a0aa3368a90b9598db44f6a4f9d
-  data.tar.gz: 1ddcb546b46c215edb5a6561a51abc5c44483aa6424f89381aa08fdc2410098609708c89f72cbac1fde6ac5715be388123f54e1c5c2e96ffc07bbf4716d21769
+  metadata.gz: d9ebf4129523305e383b03c265149063714351a9ec0f7f175b674baeb64e908ba8e7113b0e677cf8635f8c5e654c563030b2bc182688fb10c534503127a6552b
+  data.tar.gz: 4d238f151e2199e50c85e9a2b88116f81f76b83ebbc6da55a43ce549730dc46cd20ace2b85f923ec99e7e8e919d5dbc5a7d6e57bcf24cf8fcf61add3c4892ece

data/app/controllers/concerto_hardware/application_controller.rb~

@@ -0,0 +1,20 @@
+module ConcertoHardware
+  # Congratulations! You've found this engine's secret sauce.
+  # In a regular isolated engine, the engine's ApplicationController
+  # inherits from ActionController::Base. We're using the the main app's
+  # ApplicationController, making the isolation a little less strict.
+  # For example, we get the layout from the main Concerto app.
+  # Note that links back to the main application will need to directly
+  # reference the main_app router.
+  helper_method :current_accessor2
+  class ApplicationController < ::ApplicationController
+    def current_ability
+      # Use the Ability class defined in this engine's namespace.
+      # It is designed to also include the rules from the main app.
+      @current_ability ||= ConcertoHardware::Ability.new(current_accessor)
+    end
+    def current_accessor2
+      current_accessor
+    end
+  end
+end

data/app/controllers/concerto_hardware/players_controller.rb

@@ -41,7 +41,8 @@ class PlayersController < ConcertoHardware::ApplicationController
       format.html # show.html.erb
       format.json {
         render :json => @player.to_json(
-          :include => { :screen => { :only => :name } }
+          :include => { :screen => { :only => :name } },
+          :methods => [:time_zone]
         )
       }
     end

data/app/models/concerto_hardware/ability.rb~

@@ -0,0 +1,43 @@
+module ConcertoHardware
+  # The enigne's Ability class simply extends the existing Ability
+  # class for the application. We rely on the fact that it already
+  # includes CanCan::Ability.
+  class Ability < ::Ability
+    def initialize(accessor)
+      super # Get the main application's rules
+      # The main app will delegate to user_abilities, etc.
+      # Note the inherited rules give Admins rights to manage everything
+    end
+
+    def user_abilities(user)
+      super # Get the user rules from the main applications
+
+      # For debugging you may want to make all Players readable
+      # can :read, Player
+
+      # Let's defer to Concerto's rules for Screen Permissions.
+      # This will apply to both users browsing the hardware info
+      # as well as public screens in public instances accessing their data.
+      #  - Right now, only admins can create players (TODO)
+      #  - It may become desirable in the future for reading to be
+      #    restricted or curtailed if a lot of sensitive data is stored here.
+      can :read, Player do |player|
+        !player.screen.nil? and can? :read, player.screen
+      end
+      can :update, Player do |player|
+        !player.screen.nil? and can? :update, player.screen
+      end
+      can :delete, Player do |player|
+        !player.screen.nil? and can? :delete, player.screen
+      end
+    end # user_abilities
+
+    def screen_abilities(screen)
+      super
+      # A logged-in screen can read its own Player information.
+      can :read, Player, :screen_id => screen.id
+      # In the future it may also need to write reporting data, so
+      # this will need to be expanded.
+    end # screen_abilities
+  end # class Ability
+end # module ConcertoHardware

data/app/models/concerto_hardware/player.rb

@@ -201,6 +201,24 @@ module ConcertoHardware
       return ConcertoConfig[:poll_interval].to_i
     end
 
+    # Get the timezone that has been configured for this screen,
+    # using in the standard region/city format.
+    # Example: "America/New York"
+    # This is used in the Player API for Bandshell.
+    def time_zone
+      # The concerto config and screen config are stored in
+      # ActiveSupport::TimeZone's "friendly" time zone format:
+      #   "Eastern Time (US & Canada)"
+      if screen.nil? or screen.time_zone.nil?
+        pretty_time_zone = ConcertoConfig[:system_time_zone]
+      else
+        pretty_time_zone = screen.time_zone
+      end
+      # Now just backtrack to the canonical name which will
+      # be useful to the players.
+      ActiveSupport::TimeZone::MAPPING[pretty_time_zone]
+    end
+
     def as_json(options)
       json = super(options)
       json["screen_on_off"] = ActiveSupport::JSON.decode(self.screen_on_off)

data/app/views/concerto_hardware/players/index.html.erb~

@@ -0,0 +1,49 @@
+<section class="viewblock">
+  <header class="viewblock-header">
+    <h1 class="default-padding">
+      <%= t(:all_model, :model => ConcertoHardware::Player.model_name.human.pluralize) %>
+    </h1>
+  </header>
+  <div class="viewblock-cont">
+    <table>
+      <tr>
+        <th><%= ConcertoHardware::Player.human_attribute_name(:ip_address) %></th>
+        <th><%= ConcertoHardware::Player.human_attribute_name(:screen_id) %></th>
+        <th><%= ConcertoHardware::Player.human_attribute_name(:activated) %></th>
+        <th>Actions</th>
+      </tr>
+
+      <% @players.each do |player| %>
+        <tr>
+          <td><%= player.ip_address %></td>
+          <td><%= player.screen.name %></td>
+          <td><%= player.activated %></td>
+
+          <td>
+            <% if can? :read, player %>
+              <%= link_to t(:show, :model => ConcertoHardware::Player.model_name.human), player, :class => "btn" %>
+            <% end %>
+            <% if can? :edit, player %>
+              <%= link_to t(:edit, :model => ConcertoHardware::Player.model_name.human), edit_player_path(player), :class => "btn" %>
+            <% end %>
+            <% if can? :delete, player %>
+                <%= link_to t(:destroy, :model => ConcertoHardware::Player), player, 
+        :data => { :confirm => t(:are_you_sure_delete_model_key, :model =>ConcertoHardware::Player.model_name.human, :key => player.screen.name) }, :method => :delete, :class => "btn" %>
+            <% end %>
+          </td>
+        </tr>
+      <% end %>
+    </table>
+  </div>
+</section>
+<div class="default-padding">
+    <%# for demo purposes: %>
+    Note: the poll interval is currently set to <%=ConcertoConfig[:poll_interval]%> seconds.<br/>
+    <% [::Ability.new(current_accessor2), ConcertoHardware::Ability.new(current_accessor2)].each do |ma| %>
+      The ability class is <%=ma.class%>.<br/>
+      Screen: <%= ConcertoHardware::Player.find(4).screen.name %>.<br/>
+      Can read screen: <%=ma.can? :read, ConcertoHardware::Player.find(4).screen%>.<br/>
+      Can read player: <%=ma.can? :read, ConcertoHardware::Player.find(4)%>.<br/>
+    <%end%>
+</div>
+

data/lib/concerto_hardware/version.rb

@@ -1,3 +1,3 @@
 module ConcertoHardware
-  VERSION = "0.6"
+  VERSION = "0.7"
 end

data/lib/concerto_hardware/version.rb~

@@ -0,0 +1,3 @@
+module ConcertoHardware
+  VERSION = "0.6"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: concerto_hardware
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: '0.7'
 platform: ruby
 authors:
 - Concerto Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-13 00:00:00.000000000 Z
+date: 2015-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -41,15 +41,18 @@ files:
 - app/assets/stylesheets/concerto_hardware/players.css.scss
 - app/assets/stylesheets/scaffolds.css.scss
 - app/controllers/concerto_hardware/application_controller.rb
+- app/controllers/concerto_hardware/application_controller.rb~
 - app/controllers/concerto_hardware/players_controller.rb
 - app/helpers/players_helper.rb
 - app/models/concerto_hardware/ability.rb
+- app/models/concerto_hardware/ability.rb~
 - app/models/concerto_hardware/player.rb
 - app/views/concerto_hardware/players/_form.html.erb
 - app/views/concerto_hardware/players/_show_body.html.erb
 - app/views/concerto_hardware/players/_show_header.html.erb
 - app/views/concerto_hardware/players/edit.html.erb
 - app/views/concerto_hardware/players/index.html.erb
+- app/views/concerto_hardware/players/index.html.erb~
 - app/views/concerto_hardware/players/new.html.erb
 - app/views/concerto_hardware/players/show.html.erb
 - app/views/concerto_hardware/screens/_screen_link.html.erb
@@ -61,6 +64,7 @@ files:
 - lib/concerto_hardware/engine.rb
 - lib/concerto_hardware/time_accessible.rb
 - lib/concerto_hardware/version.rb
+- lib/concerto_hardware/version.rb~
 - test/fixtures/players.yml
 - test/functional/players_controller_test.rb
 - test/unit/helpers/players_helper_test.rb
@@ -85,12 +89,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A Rails Engine for managing Bandshell-powered Concerto hardware
 test_files:
-- test/fixtures/players.yml
-- test/functional/players_controller_test.rb
-- test/unit/helpers/players_helper_test.rb
 - test/unit/player_test.rb
+- test/unit/helpers/players_helper_test.rb
+- test/functional/players_controller_test.rb
+- test/fixtures/players.yml