concerto_hardware 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5199652ed176b2cb7101660cebc00f3ff1841abf
-  data.tar.gz: 17f4f736cab0eb95dd2261e7c65445030a671504
+  metadata.gz: 78926444b14981b5a897bcbd8662f7d1abb5d2b6
+  data.tar.gz: 7e521966dae2d75ab103e62869eac6019100de01
 SHA512:
-  metadata.gz: c1c22788165ae90ddd7d0d7cd89938f46bf6572bd68babff0bb1a8982455df954eee922c3de5dd1e90fe1a0b8257e1ac6bc5a4b52fb8de97e37bb267c0851854
-  data.tar.gz: 351aa8ae7cf18ee0d4a553344fa16297a38601116f05be0c1d841fc2cdc894bdfece540d5fd682aa1b80c1c77ebb7b2370330d23f2706937b1f65e2ae2e62183
+  metadata.gz: f13bb763b161fa1cb5c10e662326d1a2261bc7e8369276d642ee9302850e2edb76dbd3ac908848a1b955851a45d37a5bd62f2d53b66da2e7a23330778f51414d
+  data.tar.gz: 115b314f996a2b566da9e0d91605abc70e93f9882f37956632a71a4681100bcffbbf1de3f642bd7a9b85fdea18aa77ca04bef493d94729579c307065124f5c16

data/app/controllers/concerto_hardware/players_controller.rb

@@ -42,7 +42,11 @@ class PlayersController < ApplicationController
 
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @player}
+      format.json {
+        render :json => @player.to_json(
+          :include => { :screen => { :only => :name } }
+        )
+      }
     end
   end
 
@@ -71,7 +75,7 @@ class PlayersController < ApplicationController
   # POST /players
   # POST /players.json
   def create
-    @player = Player.new(params[:player])
+    @player = Player.new(player_params)
     auth!
 
     respond_to do |format|
@@ -92,7 +96,7 @@ class PlayersController < ApplicationController
     auth!
 
     respond_to do |format|
-      if @player.update_attributes(params[:player])
+      if @player.update_attributes(player_params)
         format.html { redirect_to [hardware, @player], :notice => 'Player was successfully updated.' }
         format.json { head :no_content }
       else
@@ -114,6 +118,14 @@ class PlayersController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+
+  # Deal with strong parameter restrictions.
+  def player_params
+    params.require(:player).permit(:wkday_on_time, :wkday_off_time,
+      :wknd_on_time, :wkday_off_time, :wknd_disable, :force_off)
+  end
 end
 
 end

data/app/models/concerto_hardware/player.rb

@@ -1,17 +1,18 @@
+require 'concerto_hardware/time_accessible'
+
 module ConcertoHardware
   class Player < ActiveRecord::Base
-    belongs_to :screen
+    # Get the time_accessor method for virtual Time attributes
+    extend ConcertoHardware::TimeAccessible
 
-    def self.time_accessor(*syms)
-      syms.each do |sym|
-        attr_accessor sym
-        composed_of sym,
-              :class_name => 'Time',
-              :mapping => [sym.to_s, "to_s"],
-              :constructor => Proc.new{ |item| item },
-              :converter => Proc.new{ |item| item }
-      end
-    end
+    # Virtual attributes (these are read from and written to the database
+    # as parts of serialized JSON fields such as screen_on_off)
+    time_accessor :wkday_on_time, :wkday_off_time
+    time_accessor :wknd_on_time, :wknd_off_time
+    attr_accessor :wknd_disable
+    attr_accessor :force_off
+
+    belongs_to :screen
 
     # Hack to get the multiparameter virtual attributes working
     def self.create_time_zone_conversion_attribute?(name, column)
@@ -23,12 +24,6 @@ module ConcertoHardware
     validates_presence_of :screen, :message => 'must exist'
     validates_uniqueness_of :screen_id
 
-    time_accessor :wkday_on_time, :wkday_off_time
-    time_accessor :wknd_on_time, :wknd_off_time
-    time_accessor :party_time
-    attr_accessor :wknd_disable
-    attr_accessor :force_off
-
     after_initialize :default_values
     after_find :retrieve_screen_on_off
     before_save :process_screen_on_off
@@ -169,7 +164,6 @@ module ConcertoHardware
       return ConcertoConfig[:poll_interval].to_i
     end
 
-
     def as_json(options)
       json = super(options)
       json["screen_on_off"] = ActiveSupport::JSON.decode(self.screen_on_off)

data/config/routes.rb

@@ -13,9 +13,9 @@ ConcertoHardware::Engine.routes.draw do
   resources :players do
     collection do
       # Look up a player based on the screen ID.
-      match 'by_screen/:screen_id' => ConcertoHardware::PlayersController.action(:show)
+      get 'by_screen/:screen_id' => ConcertoHardware::PlayersController.action(:show)
       # Show the player associated with the logged in screen.
-      match 'current' => ConcertoHardware::PlayersController.action(:show)
+      get 'current' => ConcertoHardware::PlayersController.action(:show)
     end
   end
 end

data/lib/concerto_hardware/time_accessible.rb

@@ -0,0 +1,52 @@
+module ConcertoHardware
+  # Provides the time_accessor method, which is useful for creating a
+  # virtual parameter of type Time. The time is read and written as a
+  # standard Time-parasable string, which makes it possible to have form
+  # fields that reference the virtual attribute directly.
+  #
+  # Note that it is possible to set as a Time object (to save instantiations).
+  # You cannot read the Time object directly, however.
+  #
+  # Example
+  #
+  #   class MyModel
+  #     extend ConcertoHardware::TimeAccessible
+  #     time_accessor :party_time
+  #
+  #     def is_it_party_time?
+  #       Time.now > Time.new(self.party_time || "9001")
+  #     end
+  #   end
+  #
+  #   inst = MyModel.new
+  #   inst.party_time = "2011-11-11 11:11:11 -0000"
+  #   inst.party_time # => "2011-11-11 11:11:11 -0000"
+  #
+  #   inst.party_time = Time.now + 24*60*60 # the party is tommorrow
+  #   inst.party_time # => "2014-10-01 23:01:06 -0400"
+  #
+  module TimeAccessible
+    def time_accessor(*syms)
+      syms.each do |sym|
+       self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+          def #{sym}
+            if @#{sym}_timeobj.is_a? Time
+              @#{sym}_timeobj.to_s
+            else
+              nil
+            end
+          end
+          def #{sym}=(val)
+            if val.is_a? Time
+              @#{sym}_timeobj = val
+            elsif val.is_a? String
+              @#{sym}_timeobj = Time.parse(val)
+            else
+              raise ArgumentError.new("Only Strings or Times allowed")
+            end
+          end
+        RUBY
+      end
+    end
+  end # TimeAccessible
+end # ConcertoHardware

data/lib/concerto_hardware/version.rb

@@ -1,3 +1,3 @@
 module ConcertoHardware
-  VERSION = "0.1"
+  VERSION = "0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: concerto_hardware
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Concerto Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-21 00:00:00.000000000 Z
+date: 2014-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -55,6 +55,7 @@ files:
 - db/migrate/20121220000000_create_concerto_hardware_players.rb
 - db/migrate/20131127201048_add_updates_to_concerto_hardware_players.rb
 - lib/concerto_hardware/engine.rb
+- lib/concerto_hardware/time_accessible.rb
 - lib/concerto_hardware/version.rb
 - lib/concerto_hardware.rb
 - LICENSE