concerto_hardware 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fdc72cff4e3b1b64ace692f41abacc3987be3f7
-  data.tar.gz: e2e59630942b1067627f2b373b01d74e460e46c6
+  metadata.gz: 3e5b029ac779d47ff507e317a6cf81cff535234c
+  data.tar.gz: e555cf4fb696e6a492b7714b901615c8fd3890f3
 SHA512:
-  metadata.gz: 152baa10985ed73ff436dfa62b4f5111453ea3e5b3bd3a09ddb0a8057a21edde8ece9411387afc729fa311363325d81f11191f60911857c27ea5d457a9b8564a
-  data.tar.gz: 2cd1e98713bde6c720479fad5ef4ad82d868c74780f63294e63d35a56aa767e699fb2800955f0faa3766c8b7d44881a5a4d3e46ce3c0993f0d74d63a018116ff
+  metadata.gz: 62594594cfa2a92502262894578ba90cdf99b04c692e7b16c1bcd207abb3a573db80b85ddbc6b6a7b26ed9381de1383611fd796bbfe44ecc7b957c174e3e3b2e
+  data.tar.gz: 5969ec4a9c47dd55aab1429d70e7305fd68177bff4432223721eaa4e659b42b33c79847c40bcd5add1969d9233a4cbbad74cbbf2513150bd5afbbafb3cfbecd0

data/README.rdoc

@@ -1,7 +1,7 @@
 A Rails Engine for managing Bandshell-powered Concerto hardware 
 
 To use this engine, add the following to the Concerto Gemfile:
-gem 'concerto-hardware', :path => '/path/to/concerto-hardware'
+gem 'concerto_hardware', :path => '/path/to/concerto_hardware'
 
 To create the proper migrations, use:
-rails generate concerto-hardware
+rails generate concerto_hardware

data/app/controllers/concerto_hardware/players_controller.rb

@@ -33,13 +33,16 @@ class PlayersController < ApplicationController
         raise ActiveRecord::RecordNotFound, "Couldn't find an authenticated screen."
       else
         @player = Player.find_by_screen_id!(current_screen.id)
+        @player.ip_address = request.remote_ip if @player
       end
     end
     auth!
 
+    @player.save if @player.ip_address_changed?
+
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @player }
+      format.json { render :json => @player}
     end
   end
 

data/app/models/concerto_hardware/player.rb

@@ -165,5 +165,17 @@ module ConcertoHardware
       end
     end
 
+    def polling_interval
+      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)
+      json["polling_interval"] = self.polling_interval
+      json
+    end
+
   end # class Player
 end # module ConcertoHardware

data/lib/concerto_hardware/version.rb

@@ -1,3 +1,3 @@
 module ConcertoHardware
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: concerto_hardware
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Concerto Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-12 00:00:00.000000000 Z
+date: 2014-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails