ten_hs_server 0.1.1 → 0.1.2

data/lib/ten_hs_server/device.rb

@@ -41,11 +41,11 @@ module TenHsServer
 
     # Properties
     def on?
-      true ? query[:status] == 2 : false
+      query[:status] == 2 ? true : false
     end
 
     def off?
-      true ? query[:status] == 3 : false
+      query[:status] == 3 ? true : false
     end
 
     def type

data/lib/ten_hs_server/room.rb

@@ -65,10 +65,10 @@ module TenHsServer
             devices_in_room << device
           end
         end
-        
+
         {
           name: name,
-          floor: devices_in_room[0].floor,
+          floor: devices_in_room.any? ? devices_in_room[0].floor : nil,
           devices: devices_in_room
         }
 

data/lib/ten_hs_server/version.rb

@@ -1,3 +1,3 @@
 module TenHsServer
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/test/ten_hs_server/room_test.rb

@@ -27,6 +27,17 @@ class RoomTest < ActiveSupport::TestCase
     assert_equal 2, room.devices.count
   end
 
+  test "should try to load a room with no devices or an unexisting room" do
+    TenHsServer::Device.expects(:get).with(
+      "?t=99&f=GetDevices",
+    ).returns(
+      stub body: fixture("devices_result.html")
+    )
+
+    room = TenHsServer::Room.new "Foobar"
+    assert_equal nil, room.floor
+  end
+
   test "should turn on everything in a room" do
     TenHsServer::Device.expects(:get).with(
       "?t=99&f=GetDevices",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ten_hs_server
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-19 00:00:00.000000000 Z
+date: 2012-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -140,7 +140,6 @@ files:
 - lib/ten_hs_server/adapter.rb
 - lib/ten_hs_server/device.rb
 - lib/ten_hs_server/event.rb
-- lib/ten_hs_server/floor.rb
 - lib/ten_hs_server/room.rb
 - lib/ten_hs_server/version.rb
 - ten_hs_server.gemspec